Fixes to the release behaviour of WaratekLocation
Fix stop behaviour for container in test
Misc tidying up