Merge changes from mesos/spark master