Merge pull request #464 from claco/proposed/juno

backport - proposed/juno - Use {{ ansible_fqdn }} for service checks