SRCH-109 merge trunk r116958

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