Merge "actually turn on neutron cli tests"