BZ115918 - Added configurable ha dns prefix to routing daemon

* Also stuffed a fix that removes a c/p error from watchman
Merge pull request #5983 from calfonso/bz1159182

Merged by openshift-bot