Merge "Change openjdk baseOS imgs to integration-*"