Fixes testing with Keystone master

Fixed two issues I came across while testing devstack with Keystone trunk. One is the use of the RAX-KEY extensions; that has been deprecated, so removing it from the default config file template. The other is I was getting the incorrect USERNAME submitted to Keystone and that was because $USAERNAME was being picked up from the OS environment (and not from any of our .rc files)