ACCUMULO-2337 Increase timeout on MetaSplitTest.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
Merge branch '1.6.0-SNAPSHOT'