BLTI-230

Merge trunk improvements with branch improvements in test harness




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