Minor typo corrections

Change-Id: I5361027a60804e1aa2f30086e7945da0cf7bdd61
Fixed keystone test data to match openstack_auth.

Fixes bug 1207599

Change-Id: I2cc333911cc0d07cab9c0c550a8d0d69f374634c
Merge "Minor typo corrections"