Merge "Fix groupId for nonrtric-controlpanel-gateway"