SRCH-73 merge r102966,102967 from trunk

git-svn-id: https://source.sakaiproject.org/svn/search/branches/search-1.4.x@118568 66ffb92e-73f9-0310-93c1-f5514f145a0a
SRCH-75 merge r103111 from trunk

git-svn-id: https://source.sakaiproject.org/svn/search/branches/search-1.4.x@118569 66ffb92e-73f9-0310-93c1-f5514f145a0a
SRCH-106 merge r111638 from trunk

git-svn-id: https://source.sakaiproject.org/svn/search/branches/search-1.4.x@118570 66ffb92e-73f9-0310-93c1-f5514f145a0a
SRCH-104 merge r111640 from trunk

git-svn-id: https://source.sakaiproject.org/svn/search/branches/search-1.4.x@118571 66ffb92e-73f9-0310-93c1-f5514f145a0a
SRCH-96 merge r110962 from trunk

git-svn-id: https://source.sakaiproject.org/svn/search/branches/search-1.4.x@118572 66ffb92e-73f9-0310-93c1-f5514f145a0a