ACCUMULO-1710 made proxy IT verify data
ACCUMULO-1920 should not close shared zookeeper session; clean up unused watcher list
ACCUMULO-1922 accomodate new jar structure
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-1911 increase the zookeeper poll rate to 5 seconds
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-1921 check for null
Merge branch '1.6.0-SNAPSHOT'