Merge branch '1916_nonvfs_fixup'

Merge branch '1916_nonvfs_fixup'

* 1916_nonvfs_fixup:
  Rewritten vfs_canon_and_translate() function for using glib functions.
  VFS: renamed USE_VFS to ENABLE_VFS
  VFS: fixed help description for --disable-vfs
  src/file.c: Fixed warning on unused parameter on non-vfs build
  VFS: removed duplicate O_LINEAR declaration in src/vfsdummy.h
  VFS: added non-vfs version of vfs_canon_and_translate()
  VFS: added non-vfs version of vfs_translate_path_n()
  VFS: added non-vfs version of vfs_get_encoding()
  VFS: fixing symbol clash on mc_ungetlocalcopy() at non-vfs build
  VFS: fixing symbol clash on mc_readlink() at non-vfs build
  VFS: fixing symbol clash on mc_utime() at non-vfs build
  VFS: fixing symbol clash on mc_write() at non-vfs build
  VFS: fixing symbol clash on mc_read() at non-vfs build
  VFS: fixing symbol clash on vfs_file_is_local() at non-vfs build
  VFS: fixing symbol clash on vfs_current_is_local() at non-vfs build
  VFS: fixing symbol clash on vfs_init() and vfs_shut() at non-vfs build
  VFS: fixed lots of missing includes to vfs/vfs.h
  Ticket #1916: non-vfs build fixups