ACCUMULO-1785 comment was messged up when resolving patch conflict
Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	bin/config.sh
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
ACCUMULO-1790 found a missing config item, and behavior change
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

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