ACCUMULO-378 More rb changes.
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-378 Change plural property to match other convention