Merge "Add parameters for OpenStack connections for v3 auth"