Merge changes I260758f1,Ib6c2ed11

* changes:
  Clean up USER_OWNER reference in PMS
  Clean up USER_OWNER in notifications