ENG-7152 handle better -J sqlcmd command line option
Merge pull request #1770 from VoltDB/ENG-7152

ENG-7152 handle better -J sqlcmd command line option
Merge remote-tracking branch 'upstream/master'