JBTM-1569 Allows topics to be shared between servers

A proposed fix