Merge remote-tracking branch 'origin/v4.6' into v4.7
Conflicts:
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java
lams_central/conf/language/lams/ApplicationResources.properties
lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
lams_central/src/java/org/lamsfoundation/lams/webservice/UserRoleServlet.java
lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java
lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
lams_tool_assessment/conf/language/lams/ApplicationResources.properties