add correct media format profiles to res elements
Normalize orgPn usage
one more standardization of contentFeatures
Merge remote-tracking branch 'upstream/master'