Trying to fix the openstack update to java 7 and app engine 1.8.9
Fixing some classes
Fixing Libs
Fixing libs
Fixing classpath
Fix eclipse preferences
Merge remote-tracking branch 'remotes/origin/OpenstackUpdateReturns'

Conflicts:
	.classpath
	.settings/com.google.appengine.eclipse.core.prefs
	testlibs/appengine-api-stubs.jar
	testlibs/appengine-testing.jar
Rollback to working version