Merge changes Idfec610d,I68011fd3

* changes:
  Allow setting User Restrictions per user type
  Support custom user types (profiles)