Cleans up the keystone manifest

This patch makes the following changes to the keystone auth manifest:

  * Fixes the tenant variable in the Keystone_user_role notification
  * Modifies the tests to account for the above point

Change-Id: I94716b165750f0a89112028608b78ff6712c54de
Merge "Cleans up the keystone manifest"