fixes #6060 - Fixes activation-key content override, BZ 1104638
Merge pull request #4781 from cfouant/content-override

fixes #6060 - Fixes activation-key content override, BZ 1104638