Merging back with trunk


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-search-improvements@726925 13f79535-47bb-0310-9956-ffa450edef68