* BAEL-3576: Update modelmapper to 2.3.5 * BAEL-3576: Code cleanup
Revert "BAEL-3275: Using blocking queue for pub-sub"