Merge "Use ONAP recommended base Java Docker image"