Fixes #8235: Add orgzanization_id to the systems json which is generated
fixes #6060 - Fixes activation-key content override, BZ 1104638
Merge pull request #4789 from bkearney/bkearney/8235

Fixes #8235: Add orgzanization_id to the systems json which is generated
Merge pull request #4781 from cfouant/content-override

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