KNL-1123 merge of 308063 had conflict resolution error, replayed merge and removed change introduced in resolution

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@308953 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1243 merge 308936 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@308954 66ffb92e-73f9-0310-93c1-f5514f145a0a