[SPARK-2925] [sql]fix spark-sql and start-thriftserver shell bugs when set --driver-java-options#1851

scwf wants to merge 4 commits intoapache:masterapache/spark:masterfrom

scwf:patch-2scwf/spark:patch-2Copy head branch name to clipboard