Merge "bug 741 - Make sure to stop threads on bundle stop on TopologyServiceShim"