SAM-2066: Multiple-choice answers using CKeditor cause unwanted line break

git-svn-id: https://source.sakaiproject.org/svn/sam/trunk@128657 66ffb92e-73f9-0310-93c1-f5514f145a0a