ACCUMULO-2826 Allow single CF for IntersectingIterator
[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
ACCUMULO-3175 Move test annotation timeouts into the Rule with scaling factor.

Also include the scaling factor in some sleep/wait statements in tests.
Merge branch '1.6.2-SNAPSHOT'

Conflicts:
	test/src/test/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
ACCUMULO-3175 Include scaling factor in sleep statement
Merge branch '1.6.2-SNAPSHOT'
ACCUMULO-2913 Add more scaling timeouts
ACCUMULO-3175 Fix some findbugs warnings
Merge branch '1.6.2-SNAPSHOT'
ACCUMULO-3160 Remove duplicate code from ConfigurableMacIT.

Also changes the test from sharing a MAC to starting a new one
for each test method which better isolates test failures.
Merge branch '1.6.2-SNAPSHOT'

Conflicts:
	test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
ACCUMULO-2480 make the tserver give up and die if openning the WAL experiences 5 errors in 10 seconds
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
ACCUMULO-2480 move IT into the src/test tree
ACCUMULO-3030 allow scanners to be interrupted