Updating keystone role searches

  Reflecting changes in e7c6430483bb1655ed1511717c75d8cec5389c66
syntax cleanup
Merge pull request #268 from galstrom21/keystone_refactor

Merged automatically by jenkins after successful build test