added user role management to keystone
Reversed change to docstring
Added role stuff to user creation
indentation fix
Merge pull request #7209 from KennethWilke/develop

Added user role handling to keystone module and state