BLTI-230 

Catch up with trunk



git-svn-id: https://source.sakaiproject.org/svn/basiclti/branches/BLTI-230@125714 66ffb92e-73f9-0310-93c1-f5514f145a0a
BLTI-230

Synchroniize the branch.



git-svn-id: https://source.sakaiproject.org/svn/basiclti/branches/BLTI-230@125720 66ffb92e-73f9-0310-93c1-f5514f145a0a