Merge commit '9b5f216eb1069dc8f5211bf81bf5e2fb46bebbe1' into
OT_BETA_JAVA8

Conflicts:
	plugins/org.eclipse.objectteams.otdt.jdt.ui/META-INF/MANIFEST.MF
	releng/build-scripts/build/otdt_prerequisites.sh
	releng/map/otdt.map.in