Re-working 'vtctl InitTablet' command line. Enough is enough.
Merge branch 'master' into replication
Merge branch 'master' into replication