Merge "Use port 12345 instead of 8080 in UT" into topic/schema