adding keystone-setup role
keystone role now uses keystone-setup role
Merge pull request #385 from galstrom21/keystone_cleanup

Keystone role cleanup
Unwinding merge 78a339509
Merge pull request #387 from galstrom21/master

Unwinding merge 78a339509150f2a35b144dafbddd9e2f04945154