Merge "Code review cleanup for: Add kafka messaging support to integration test module"