SPARK-2624 keep java imports together