Merge pull request #465 from claco/stable/icehouse

backport - stable/icehouse - Use {{ ansible_fqdn }} for service checks