Apply HADOOP-8886 patch to remove kfs dep