[#1950] WIP
[#1952] Removed DIRECT_ACCESS_VAULT flags and added missing FS metadata
bits of code
Merge branch 'master' of https://github.com/irods/irods.git

resolved merge conflict