merged changes from UC-1426: MoH should be configurable as Highly Available