WL-3219 Merge EVALSYS-1387.patch

See https://jira.sakaiproject.org/browse/EVALSYS-1387