Merge "Avoid errors in log when neutron tests are skipped"