Merge "Revert "disable neutron network tests that fail too much""