auth dict different between file config and env vars config

[Everett Toews]

This code

    import pprint

    import os_client_config

    occ = os_client_config.OpenStackConfig()
    cloud_config = occ.get_one_cloud('test_cloud')

    print('test_cloud')
    pprint.pprint(cloud_config.config)

    occ = os_client_config.OpenStackConfig()
    cloud_config = occ.get_one_cloud('envvars')

    print('envvars')
    pprint.pprint(cloud_config.config)

produces output like the following

    test_cloud
    {'api_timeout': None,
     'auth': {
       'auth_url': 'http://xxx.xxx.xxx.xxx:5000/v2.0',
       'password': 'devstack',
       'project_name': 'demo',
       'username': 'demo'},
     'auth_type': 'password',
     'region_name': 'RegionOne',
     ...
     'volume_api_version': '1'}

    envvars
    {'api_timeout': None,
     'auth': {
       'project_name': 'demo'},
     'auth_type': 'password',
     'auth_url': 'http://xxx.xxx.xxx.xxx:5000/v2.0',
     'password': 'devstack',
     'username': 'demo',
     'region_name': 'RegionOne',
     ...
     'volume_api_version': '1'}

Note how the auth dict between the file config taken from 'test_cloud' is different from the env vars config taken from 'envvars'.

This makes it impossible to have code that uses occ to treat config taken from a file or from env vars the same.