Keystone role cleanup
Merge pull request #386 from galstrom21/sprint

Keystone role cleanup