Further changes related to activemq upgrade. Shutdown appears to go differently and processes like the indexer went nuts.

Add an abstract class to handle shutdown more cleanly.