Merge branch '1.5.3-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	assemble/pom.xml
	core/pom.xml
	examples/pom.xml
	examples/simple/pom.xml
	fate/pom.xml
	minicluster/pom.xml
	minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
	minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
	pom.xml
	proxy/pom.xml
	server/tserver/pom.xml
	start/pom.xml
	test/pom.xml
	trace/pom.xml
tree: a180c855164a36e2d538b3d7e67d50049dccd48a
  1. examples/
  2. src/
  3. .gitignore
  4. pom.xml
  5. proxy.properties
  6. README