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

@ehelms - test added