Apply same fix issued in JDF pull 415: cluster-ha-singleton fixes