Merge branch 'noc-1099' into 'master'

Change user_permissions field to permissions (fix create user).

See merge request !2547

(cherry picked from commit fa5ae076)

bbd0a4d5 Change user_permissions field to permissions (fix create user).
13 jobs for !2553 with cherry-pick-fa5ae076 in 17 minutes and 27 seconds (queued for 3 seconds)
merge request