Merge changes I1b74d58b,I38c6e8bc

* changes:
  ServiceManager: Allow system services running as secondary users to add services
  ServiceManager: Restore basic uid check