BLTI-208 merge trunk r122489

git-svn-id: https://source.sakaiproject.org/svn/basiclti/branches/basiclti-2.1.x@122591 66ffb92e-73f9-0310-93c1-f5514f145a0a
BLTI-222 decrement <parent> to 2.9-SNAPSHOT

git-svn-id: https://source.sakaiproject.org/svn/basiclti/branches/basiclti-2.1.x@122596 66ffb92e-73f9-0310-93c1-f5514f145a0a