ACCUMULO-1595 remove code to lock jvm to ram
ACCUMULO-1595 remove mlock config entry
ACCUMULO-1596 moved Mutator interface up to IZooReaderWriter
ACCUMULO-1596 moved Mutator interface up to IZooReaderWriter
ACCUMULO-1586 committing Michael Berman's patch
ACCUMULO-998 Use junit asserts and fix code formatting for tests
ACCUMULO-1533 Clean up deprecated mapreduce and thrift code
Merge branch 'Merge ctubbsii changes for ACCUMULO-998 and ACCUMULO-1533'
Merge remote-tracking branch 'asf/master' into ACCUMULO-1496

Conflicts:
	server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java