Changes in Utils.scala for SPARK-1853