SAK-15769 merge 110862,110863 from trunk


git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@110955 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22229 merge r110918 from trunk


git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@111175 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22395 merge r111188 from trunk

git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@112297 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22428 merge r110966 from trunk

git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@112298 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22014 - 2.9.x merge

svn merge -c110681 https://source.sakaiproject.org/svn/config/trunk/
Conflict discovered in 'configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: r
--- Merging r110681 into '.':
U    configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties

svn merge -c111980 https://source.sakaiproject.org/svn/config/trunk/
Conflict discovered in 'configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: r
--- Merging r111980 into '.':
G    configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties

svn merge -c111980 https://source.sakaiproject.org/svn/reset-pass/trunk/
--- Merging r111980 into '.':
U    reset-pass/src/java/org/sakaiproject/tool/resetpass/ConfirmProducer.java
U    reset-pass/src/java/org/sakaiproject/tool/resetpass/FormHandler.java

in-uits-gjthomas:site-manage gjthomas$ svn merge -c111980 https://source.sakaiproject.org/svn/site-manage/trunk/
--- Merging r111980 into '.':
U    site-manage-participant-helper/src/java/org/sakaiproject/site/tool/helper/participant/impl/SiteAddParticipantHandler.java


git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@113234 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-600 merge r112465,r112466,r113204,r113206,r113207 from trunk


git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@113271 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-640 merge r112463 from trunk


git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@113276 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-826 merge r106292,r106293,r106294 from trunk


git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@113279 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-921 merge r108080,r108081,r108082 from trunk


git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@113284 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21707 merge r106695,r113311 from trunk


git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@113312 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22177 merge r108110:108112 from trunk


git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@113318 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22386 merge r110541 from trunk

git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@113327 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22486 merge r111502 from trunk

git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@113360 66ffb92e-73f9-0310-93c1-f5514f145a0a
NL-532 monster merge for 2.9.x encompassing 105130:105167


git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@113396 66ffb92e-73f9-0310-93c1-f5514f145a0a