Merge "Improve cleanup logic for trunk tests"
tree: 7c491bd6ba547bd0fa5f4942b93ca1f6383ac61b
  1. neutron/