Merge remote-tracking branch 'asf/master' into ACCUMULO-802

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
	server/src/main/java/org/apache/accumulo/server/master/Master.java
Merge remote-tracking branch 'asf/master' into ACCUMULO-802
ACCUMULO-1626 fixed equals method in mutation
ACCUMULO-802 Fix mock
Merge remote-tracking branch 'origin/1.4.4-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
	core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT'
Merge remote-tracking branch 'wisellama/ACCUMULO-802' into ACCUMULO-802

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
	core/src/main/java/org/apache/accumulo/core/client/mock/MockTableNamespaceOperations.java
Merge remote-tracking branch 'asf/master' into ACCUMULO-802
Merge pull request #1 from ctubbsii/ACCUMULO-802

Accumulo 802