Merge "remove dependency on neutron dummy provider"