Merge "changes for kafka upgrade"