ACCUMULO-2438 Backport the changes to ensure that we watch separate sets of tables for merges
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

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