ACCUMULO-3332 Fix incorrect import in cloudstone slaves.py
ACCUMULO-3333 Pass in username and password to `accumulo shell`
ACCUMULO-3334 Fix arguments passed to TeraSortIngest by CloudStone4
Merge branch '1.5' into 1.6

Conflicts:
	test/system/bench/cloudstone1/cloudstone1.py
Merge branch '1.6'