ACCUMULO-3338 Fixing classpath items for busbey.
Merge branch '1.6'

Conflicts:
	assemble/bin/bootstrap_config.sh