Corecomponents - Added NON-NLS comment tags

Fixed merge conflict.