Merge "Removing ONAP O-Parent as parent from CPS"