LSNBLDR-236; keep branch in sync


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