user w/ specific perm unable to see in search

adjust security filter to use and OR between GenericRole permissions
and specific user permissions. if a GenericRole was removed, the
result was those layers were too even if a user had permission

refs #1049
Merge pull request #1050 from ischneider/iss-1049-generic-object-role-bug-in-search

Iss 1049 generic object role bug in search