[SPARK-13423] [HOTFIX] Static analysis fixes for 2.x / fixed for Scala 2.10, again#11496

Closed

srowen wants to merge 1 commit intoapache:masterfrom

srowen:SPARK-13423.3

Commits on Mar 3, 2016

Fixes (another) compile problem due to inadvertent use of Option.contains, only in Scala 2.11
srowen
committed