Adjust the other cfengine and cfengine-masterfiles ports CONFLICTS to recognize the new cfengine sister ports. Add cfengine and cfengine-masterfiles 310 to their respective metaports.