Merge "Fix jobs for nonrtric-plt-rappcatalogue-enhanced"