Merge in openjdk-chef-build