Merge "Added system_server to system group" into oc-mr1-dev