Merge "Add test to verify FQDN hostname sanitization"