[maven-release-plugin] prepare release 1.6.1
[maven-release-plugin] prepare for next development iteration
Merge branch '1.6.2-SNAPSHOT' of http://git-wip-us.apache.org/repos/asf/accumulo into 1.6.2-SNAPSHOT
ACCUMULO-2913 Include the timeout.factor in the duration given to `drain`
ACCUMULO-2913 Fix up some bad timings in ReplicationIT
Merge branch '1.6.2-SNAPSHOT'

Conflicts:
	assemble/pom.xml
	core/pom.xml
	docs/pom.xml
	examples/simple/pom.xml
	fate/pom.xml
	maven-plugin/pom.xml
	minicluster/pom.xml
	pom.xml
	proxy/pom.xml
	server/base/pom.xml
	server/gc/pom.xml
	server/master/pom.xml
	server/monitor/pom.xml
	server/native/pom.xml
	server/tracer/pom.xml
	server/tserver/pom.xml
	start/pom.xml
	test/pom.xml
	trace/pom.xml