BZ 1064919: Corrected Collapse id generation for 'Other' resource types (which don't have a suffix).
(cherry-picked from eb9c145)