[SECSFV-39] Add uid/gid to on-demand service as per security guideline change