Moved role constraints into model and removed edit deployment

(cherry picked from commit 720d202415b39aa622e9401113664727d14d5c3c)