SAK-25440 fix some issues after integration testing

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/SAK-25440@132506 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25440 backout change that isn't needed anymore.

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/SAK-25440@132507 66ffb92e-73f9-0310-93c1-f5514f145a0a