WL-3218 Merge EVALSYS-1100.patch

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