merge for hadoop 0.23 support