Merge "Update Centos7 java-builder image"