Cleanup bundle and pass to create_userrc

Also make nova always set auth_protocol

Change-Id: Iadf9cfa3bfd0aa8f3e95365e6230f6a58e8b923f
Add cacert handling to create_userrc

Change-Id: I8077369e8ed1fa994ec5053688daf1e682b4bd4e