PROV-810 Backport convenience methods required by Installer (Oops again)
Merge branch 'master-fix' into develop

Conflicts:
	app/models/ca_user_roles.php