Fixing two tiny bugs in keystone module. 

Hi,

I'm working with OpenStack and using Salt to manage it :) Today, I found two small issues in the keystone module.

The problem I had was exactly the same reported in this comment https://github.com/saltstack/salt/issues/8912#issuecomment-31465929

Also, a directly related pull request can be found at https://github.com/saltstack/salt/pull/8562