reflect changes for spring-hadoop master