Merge branch 'master' into 'rsync-ssh-key'

# Conflicts:
#   doc/RELEASE_NOTES.txt

RELEASE_NOTES.txt

-Release 3.3.3 (XX/YY/2020)
+Release 4.0.0 (XX/YY/2021)
 =============================
 - Fixed issue with non-ascii characters for daq/upload CLI tools
-- Added support for creating experiment subdirectories
-- Removed need for special rsync commands with mkdir
+- Fixed issue with locations that involve host/port for SFTP observer
+- Fixed issue with incorrect DAQ_DIRECTORY_MAP replacements
+- Added globus_group_id to the experiment table in the DM DB, and 
+  modified CLIs, DB and web service APIs accordingly
 
 Release 3.3.2 (07/09/2020)
 =============================