Merge "Use neutron-legacy on subnodes in devstack zuul job"