ACCUMULO-2857 Return a more real tableID
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
	core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
	core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
	server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperationsImpl.java
ACCUMULO-2857 Messed up the merge
Merge branch '1.6.1-SNAPSHOT'
Merge remote-tracking branch 'origin/master' into ACCUMULO-378
ACCUMULO-2774 Update pom to ensure enough memory for tests Adds surefire-plugin param to increase heap size for some tests with large memory requirements.

Signed-off-by: Christopher Tubbs <ctubbsii@apache.org>
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	pom.xml
ACCUMULO-378 Change plural property to match other convention
ACCUMULO-2041 should not clear compaction state while still compacting
ACCUMULO-2255 fix NPE during commit
ACCUMULO-378 When we fail to get the ReplicaSystem, wait a bit before returning

It's the sign of a bad configuration (or bad implementation). If we return
immediately, it will get near immediately re-queued and spam the system.
ACCUMULO-378 Remove API method which accepts an instance of ReplicaSystem.

There's no reason that a client would commonly have this object instantiated,
so it's a bit silly to provide a method that would cater to that case.
Merge remote-tracking branch 'origin/master' into ACCUMULO-378
ACCUMULO-2774 Started seeing failures on BlockedIOStreamTest after the patch was applied.
ACCUMULO-2774 Started seeing failures on BlockedIOStreamTest after the patch was applied.
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2864 add nullcheck in ZooSession.shutdown
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'