ACCUMULO-2275 Fix options for LotsOfTablets
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	test/system/auto/simple/tablets.py
Merge branch '1.6.0-SNAPSHOT'