Merge changes from topic "parse-authority-tm_dev" into tm-dev

* changes:
  [RESTRICT AUTOMERGE] Parse authority to separate userId and non-user parts of it
  [RESTRICT AUTOMERGE] Check cross user permissions for a given UID