KNL-1162 KNL-1184 KNL-1224 KNL-1223 KNL-1226 SAK-25839 SAK-26059 SAK-26060 SAK-26058 merge 306461 306834 307801 307802 307811 307812 307816 307822 307824 307831 307832 307833 307834 307835 307836 307896 307897 307899 307900 307901 307903 307912 307913 307915 307918 307924 307925 307934 307936 307964 307967 307978 307992 307996 307998 308010 308012 308025 308026 308034 308092 308095 308096 308135 308138 308142 308143 308147 308148 308153 308154 308161 308167 308171 308176 308217 308406 308441 308550 308562 to 10.x

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