HHH-8378 Cleanup during Bundle#stop.  Added shutdown unit test.