Rework a couple of things in the zookeeper implementation; this is in conjunction with CONNECTORS-835

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/trunk@1550150 13f79535-47bb-0310-9956-ffa450edef68
Fix for CONNECTORS-835.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/trunk@1550170 13f79535-47bb-0310-9956-ffa450edef68
Fix CONNECTORS-836.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/trunk@1550177 13f79535-47bb-0310-9956-ffa450edef68
Prepare to rebase CONNECTORS-818 branch again

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-818-2@1550489 13f79535-47bb-0310-9956-ffa450edef68
Merge in changes from original CONNECTORS-818 branch

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-818-2@1550494 13f79535-47bb-0310-9956-ffa450edef68
Rename CONNECTORS-818-2 branch to CONNECTORS-818 branch

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-818@1550496 13f79535-47bb-0310-9956-ffa450edef68