Make the zk config test work regardless of whether the hostname contains a -, add more logging.
Merge branch 'timofeyb-failing-tests'