Fix indentation problems in code, do some renaming to sync article with code
Revert "BAEL-3275: Using blocking queue for pub-sub"