Moved role constraints into model and fixed typo

(cherry picked from commit 34003d049d3a436919118cf213f5e5900eebdd18)
Removed deployment partial because it is not required anymore

(cherry picked from commit 0148d8b03ad34587c9f7b7d5455429a14adb4f66)
Merge pull request #94 from vuntz/release/roxy/master

Sync with stoney (only change is role constraints)