Fixed ContainerId so that it also uses the container name when it compares equality. Switch back to using a single index file for the topic susbcriptions lists.
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/ContainerId.java