Re-merge changes to nanite-hadoop