Update for spark 2.2.2 release#21707

tgravescs wants to merge 2 commits intoapache:branch-2.2apache/spark:branch-2.2from

tgravescs:spark222-releasetgravescs/spark:spark222-releaseCopy head branch name to clipboard