[SPARK-8406] [SQL] Backports SPARK-8406 and PR #6864 to branch-1.4#6932

liancheng wants to merge 1 commit intoapache:branch-1.4apache/spark:branch-1.4from

liancheng:spark-8406-for-1.4liancheng/spark:spark-8406-for-1.4Copy head branch name to clipboard