Add java 7 definitions to match ChefSolo.
Merge branch 'master' of github.com:Knewton/kcb_java

Conflicts:
	attributes/java.rb