ACCUMULO-1572 apply missing patch; prevent logger from killing itself on a Disconnect event
Merge branch '1.4.4-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.4.4-SNAPSHOT
ACCUMULO-1546 sliding the version since 1.4.4 has been released
ACCUMULO-1633 applying Ted Yu's patch
Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	README
	bin/config.sh
	docs/combiners.html
	docs/config.html
	pom.xml
	src/core/pom.xml
	src/core/src/main/java/org/apache/accumulo/core/Constants.java
	src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
	src/examples/pom.xml
	src/examples/simple/pom.xml
	src/examples/wikisearch/ingest/bin/ingest.sh
	src/examples/wikisearch/ingest/bin/ingest_parallel.sh
	src/examples/wikisearch/ingest/pom.xml
	src/examples/wikisearch/pom.xml
	src/examples/wikisearch/query-war/pom.xml
	src/examples/wikisearch/query/pom.xml
	src/minicluster/pom.xml
	src/proxy/pom.xml
	src/server/pom.xml
	src/server/src/main/c++/mlock/Makefile
	src/server/src/main/c++/nativeMap/Makefile
	src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
	src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
	src/server/src/main/resources/config.html
	src/start/pom.xml
	src/trace/pom.xml