Updating to reflect change in keystone conf from devstack v1
Updating to reflect change in keystone conf from devstack v1

stackforge/anvil,hagleitn/Openstack-Devstack2,mc2014/anvil,mc2014/anvil,hagleitn/Openstack-Devstack2,stackforge/anvil