SAK-26349 amendment2.patch from Brian J


git-svn-id: https://source.sakaiproject.org/svn/assignment/trunk@311299 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27731 style issues with single uploaded file. Patch from Brian B


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