Merge "ONAP: Set correct Java alternatives for ONAP project"