Merge "Skip incompatible with contrail neutron tests" into mcp/xenial/rocky