Fix Bug 880853 - Fix loading of configs with urls pointing to /templates/basic
[#882187] Add s3 to default-config