Merge branch 'devel'

Author: brianshumate

CHANGELOG.md

@@ -12,6 +12,7 @@
 - Add enable_token_persistence option (thanks @smutel)
 - Support new ARM builds for Consul 1.6.2+ (thanks @KyleOndy)
 - Add CAP_NET_BIND_SERVICE to systemd unit (thanks @smutel)
+- Fix configuration template (thanks @imcitius)
 - Update documentation (thanks @karras)
 
 ## v2.5.3