Merge "Set correct Maven version for ccsdk-oran Sonar job"