ACCUMULO-2083 - adding test for 0 byte in Key with regexes
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java
ACCUMULO-2275 Fix up the options provided to work with TestIngest.
ACCUMULO-2276 Re-fix the package names to the correct ones.
ACCUMULO-2279 Add use of timeout_factor
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java
	test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java
	test/system/auto/simple/zoo.py
	test/system/auto/simple/zooCacheTest.py