ACCUMULO-3323 Fix script invocation blocks for github formatting
Merge branch '1.6'
ACCUMULO-3328 Write a log message when GC acquires ZK lock. Improve "wait" logic inside ReplicationIT for GC to run.
ACCUMULO-3289 Add logging to discern between application and network pauses for bulkImportFiles.
Merge branch '1.6'
ACCUMULO-3289 Increase memory as it appeared the one tserver might have had irregular timer thread activity
Merge branch '1.6'

Conflicts:
	test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
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'