Merge commit 'b2576d9e6f549a954b6efcd17f28368cedea6d52' into
OT_BETA_JAVA8

Conflicts:
	releng/build-scripts/build/otdt_prerequisites.sh
	releng/map/otdt.map.in