ACCUMULO-2334 Comment in Master.upgradeZookeeper() about the checks that the monitor is also doing.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	server/src/main/java/org/apache/accumulo/server/master/Master.java
Merge branch '1.6.0-SNAPSHOT'