Merge branch 'hdfscli_mods' into 1.22-candidate
Merge "Merge branch 'hdfscli_mods' into 1.22-candidate" into 1.22-candidate