PLUS-727 Administrator can not search users through Simple Search.
Merge branch 'plus-trunk' of https://github.com/NCIP/catissue-core into plus-trunk