LPS-31995
LPS-31995 change so that this only affects new categories
LPS-31714 In cluster environment, MB message count and thread count does not increment correctly
LPS-31714 Source formatting