ACCUMULO-1920 should not close shared zookeeper session; clean up unused watcher list
ACCUMULO-1922 accomodate new jar structure
ACCUMULO-1911 increase the zookeeper poll rate to 5 seconds
ACCUMULO-1921 check for null