Merge "Make connection initialization timeout constant" into topic/schema