Use the same set of dnsmasq cnames everywhere

Before we had a different set of cnames used on the jumpbox. It was
unclear why and caused pp-smokey to fail.
Merge pull request #308 from alphagov/use-same-cnames-everywhere

Use the same set of dnsmasq cnames everywhere