synced to Perforce Change 544036
compile as Java 1.7
Merge remote-tracking branch 'origin/fromP4'

Conflicts:
	pom.xml