Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
ACCUMULO-3183 support loading compaction strategy from per table classpath
ACCUMULO-3189 add verification of compaction plan
Merge branch '1.6'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/conf/Property.java
	server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
Merge remote-tracking branch 'origin/master' into ACCUMULO-2589

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java