Merge branch '2800_ftpfs_dir_listing' into 4.8.1-stable