Merge remote-tracking branch 'origin/master' into jenkins-build-8

templates/chrony.conf.erb

@@ -6,6 +6,7 @@
 
 <%  if @fqdn == @cy_server_fqdn -%>
 # This is a time server configuration file
+<%= @fqdn %> 
 <% @cy_conf_servers.each do |this_server| -%>
 pool <%= this_server %> iburst
 
@@ -13,6 +14,7 @@ pool <%= this_server %> iburst
 
 <% if @fqdn != @cy_server_fqdn -%>
 # This is a time client configuration file
+<%= @fqdn %> 
 <% end -%>
 
 <% end -%>