Merge pull request #4185 from RosettaCommons/roccomoretti/fix_enzdes_OVL2
Fix metapatch variant naming issues.
The connect metapatches were confused about which variants they said they offered versus which ones they actually applied.
Make sure that metapatches say they provide variants which are consistent with the in-code usage of the variants. Also fix up the issue where custom variant types aren't being properly added for metapatches.