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