merging updates from Opscode
setting java_home and openjdk package names in set_java_home recipe instead of in attributes. This will allow us to specify java versions per environment.