[ENTESB-1031] Fix patch location so that they survive clean restarts
[FABRIC-905] Fix timing issues in the CuratorFramework registration.
Unignore remaining tests for 6.1