Consistent layout for bosh ip & dns

Fixes #414