[SPARK-8199][SQL] follow up; revert change in test#7505

tarekbecker wants to merge 3 commits intoapache:masterapache/spark:masterfrom

tarekbecker:SPARK-8199-FollowUptarekbecker/spark:SPARK-8199-FollowUpCopy head branch name to clipboard