ACCUMULO-2545 Add missing license headers
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (--strategy ours)
ACCUMULO-2545 Add more license headers
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

Conflicts:
	src/assemble/build.sh
	test/system/auto/simple/__init__.py
	test/system/auto/stress/__init__.py
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'