Merge "Remove neutron CLI tests"