ACCUMULO-3010 include a test to ensure recovery doesn't do a merge
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3025 check for a null pointer
ACCUMULO-3051 give zookeeper updates time to propagate