adding correct support fields and removing unnecessary components
@bug W-2193915@
@rev ctatlah@
Merging origin/mike/master-pending-addDeprecatedAndRemoveUnneededCmps into master