#6428: un-retire hadoop in F24/devel