Merge commit '7698613f7c36563430f70040457a7601e3bc9955' into
OT_BETA_JAVA8

Conflicts:
	org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier.java
	org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java
	releng/build-scripts/build/otdt_prerequisites.sh
	releng/map/otdt.map.in