CORE-4326: added support for the old app ID format
CORE-4768: Fixed an issue where a trailing slash was causing a "File not
found".
Merge remote-tracking branch 'remotes/origin/dev'