ACCUMULO-2520 change new log message about invalid delets from err to warn
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
ACCUMULO-2544: Fix match boundaries for MockTableOperations.deleteRows to be consistent with actual accumulo instance

Signed-off-by: Sean Busbey <busbey@cloudera.com>
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
Merge branch '1.6.0-SNAPSHOT'