Fix Java SimpleApp spark application#18795

christiam wants to merge 2 commits intoapache:masterapache/spark:masterfrom

christiam:masterchristiam/spark:masterCopy head branch name to clipboard