KNL-875 merge r104151 from trunk

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@119834 66ffb92e-73f9-0310-93c1-f5514f145a0a
dhorwitz@david-horwitz:~/branchmanagement/kernel-1.3.x> svn log -r119618
https://source.sakaiproject.org/svn/kernel/trunk
------------------------------------------------------------------------
r119618 | azeckoski@unicon.net | 2013-02-07 20:10:31 +0200 (Thu, 07 Feb
2013) | 4 lines

KNL-1008 change the maxElementsInMemory property inside
EhCacheFactoryBean.java to maxEntriesOnHeap, in order to sync with
recent ehcache version
Patch from Zhen Q (UM)


------------------------------------------------------------------------
dhorwitz@david-horwitz:~/branchmanagement/kernel-1.3.x> svn merge
-c119618 https://source.sakaiproject.org/svn/kernel/trunk
--- Merging r119618 into '.':
U    kernel-component/src/main/webapp/WEB-INF/authz-components.xml
U
kernel-util/src/main/java/org/sakaiproject/memory/util/EhCacheFactoryBean.java
--- Recording mergeinfo for merge of r119618 into '.':
 U  


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@120187 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-984 merge r115335,r115336 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@121309 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-968 merge trunk r109469-70

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@121894 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1038 merge trunk r121412,121425

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@121895 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1020 merge trunk r119793

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@121981 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1007 merge trunk r118019

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@122044 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1037 merge trunk r121463

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@122045 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1035 merge r121484:121486,121884 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@122224 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1050 merge r121962 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@122225 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1015 KNL-1054 KNL-1048 KNL-1029 merge 119898,119916,119952,119964,121905,121906,121909,121942,121944,121945,121947,121948,121953,121963,121971,122059,122064,122068,122080,122090,122095,122328 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@122360 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1015 merge r122405 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@122516 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1038 merge r122034 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@122614 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1038 reverse merge of r122614 due to failing test related to gatewaySiteId


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@122658 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1051 merge trunk r122138,122142,122214,122247,122249 plus added missing and required Array import statement in BasicConfigurationService.java added by KNL-989 to trunk

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@122965 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1051 KNL-1052 merge fixed some missing bits from KNL-1052 which are necessary to allow the KNL-1051 tests to pass



git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@122992 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1061, KNL-1065 merge trunk r123378, 123381, 123409

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@123608 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1070 merge r123869 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@123873 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1071 merge trunk r 124101, 124137

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@124204 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-960 merge r118863 from trunk. Had to merge this to get the unset portal.neoprefix in.


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