Use correct host names for combined roles

Change-Id: Ia748a7bc90ed667271448eb0c83e67d320f2e348
4 files changed