Merge "Nova Neutron configuration now uses keystone v3 endpoint"