HDFS-4372: switch from boxed Long to primitive long in Step