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