Rebase to solve merge conflict
Merge pull request #6663 from Martin-Grunewald/L1fixMap

L1T: Add missing postls1-customisation of hltL1GtObjectMap