Fixes #8235: Add orgzanization_id to the systems json which is generated
Merge pull request #4789 from bkearney/bkearney/8235

Fixes #8235: Add orgzanization_id to the systems json which is generated