jdk 7 microcommit
Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	compiler-2.iml
lookup interfaces