enforce JDK7
Merge branch 'master' into amqp-only

Conflicts:
	pom.xml