Further avoid duplicates by better cleanup logic
Merge branch 'hotfix-4.6.2' of https://github.com/Particular/NServiceBus into hotfix-4.6.2