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