Merge commit '876590b' into topic/merge-2.10.x

Conflicts:
	bincompat-forward.whitelist.conf
	src/reflect/scala/reflect/runtime/JavaMirrors.scala
Merge commit '3314d76' into topic/merge-2.10.x
Merge commit 'ec05aeb' into topic/merge-2.10.x