S4-129 properly handle zk CLI option for node command
Merge branch 'S4-129' into dev