FABRIC-583: Fix when the zookeeper service changes for a standalone config
Additional synchronisation to avoid problems when shutting down
Merge b5239be6cb1368cc5b15c288415f0aec542c6b36 into 46fce4db56607f1198b43b2cafa8634c81e2db62