LPS-49707 Correct Tracker descriptor matching to better match xml.
LPS-49707 Correcting Portlet mappings.