kafka-791; Fix validation bugs in System Test; patched by John Fung; reviewed by Jun Rao