NOJIRA - merge from trunk

git-svn-id: https://source.sakaiproject.org/svn/lessonbuilder/branches/LSNBLDR-208@121480 66ffb92e-73f9-0310-93c1-f5514f145a0a