CORE-4000: use a higher-level directory as the stopping point for ensuring the user has access to folders and files that are moved
CORE-4000:added a function that can be used to get the base directory for trash
Merge branch 'dev'