Some minor cleanup after SPARK-4550.#5916

sryza wants to merge 1 commit intoapache:masterapache/spark:masterfrom

sryza:sandy-spark-4550-cleanupsryza/spark:sandy-spark-4550-cleanupCopy head branch name to clipboard