Merge remote-tracking branch 'origin/v4.6' into v4.7
Conflicts:
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
lams_admin/web/integration/ltiConsumerList.jsp
lams_admin/web/signupmanagement/list.jsp