Merge changes from topic "perm_query"

* changes:
  Move add/remove permission
  Move permission info queries