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'
ACCUMULO-3289 Had made a final change that didn't get pushed.
ACCUMULO-3337 Pull back the amt of data written by default and increase timeout.

Can make scaling factor for data written when standalone cluster support is finalized.
ACCUMULO-3338 Add some extra classpath entries for necessary component jars.
Merge branch '1.6'
unbreaking build; trivial change
ACCUMULO-2913 More test stabilization
ACCUMULO-3338 Replace "End Hadoop2 requirements" and fix broken bootstrap_config.sh

bootstrap_config.sh (unintuitively) needs the matching end comments to do
its sed replacement. However, said replacement introduced an extra 'n'
character in an attempt to insert a newline for hadoop 1
ACCUMULO-3338 Hadoop is not all capitalized. Use proper capitalization.
Merge branch '1.6'

Conflicts:
	assemble/bin/bootstrap_config.sh
ACCUMULO-3282 Read file column for tablet from map instead of re-scanning metadata table.