SRCH-96 merge trunk 110962

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