[SPARK-1812] remove default args to overloaded methods

Not supported in Scala 2.11. Split them into separate methods instead.