Backported fix for bug 251776: [Content Type] Need a better way to arbitrate content types and/or editor associations