case 2274 - Disable assignment of administrator role. Also fix the edit profile roles bug.
case 2274 - Better way of checking roles.
Merge branch 'case-2274' into develop
Merge remote-tracking branch 'origin/develop'