HDFS-5595: WIP 3
HDFS-5594: remove unused imports from FileSystem.
Merge branch 'HDFS-5594' into HDFS-5595