[SPARK-14915] Fix incorrect resolution of merge conflict in commit bf3c0608f1779b4dd837b8289ec1d4516e145aea#12950

Closed

srowen wants to merge 1 commit intoapache:branch-1.6from

srowen:SPARK-14915.2

Commits on May 6, 2016

Fix incorrect resolution of merge conflict in commit bf3c0608f1779b4dd837b8289ec1d4516e145aea to branch-1.6, which back-ported SPARK-14915
srowen
committed