Merge changes from topic "permTree-sc-dev" into sc-qpr1-dev

* changes:
  [automerge] RESTRICT AUTOMERGE Validate permission tree size on permission update 2p: 1d86c8b299
  RESTRICT AUTOMERGE Validate permission tree size on permission update