fix merge conflict with settings
Merge remote-tracking branch 'origin/80598-case' into autostaging
Merge remote-tracking branch 'origin/multimedia-case-properties' into autostaging
Merge remote-tracking branch 'origin/cache-locations' into autostaging
Merge remote-tracking branch 'origin/hq-dropdown' into autostaging
Merge remote-tracking branch 'origin/refactor-domain-copy2' into autostaging
Merge branch 'vellum-requirejs+use-django-compressor' into autostaging
Merge remote-tracking branch 'origin/dynamic-links' into autostaging
Merge remote-tracking branch 'origin/offline-install-multimedia' into autostaging
Merge remote-tracking branch 'origin/logos' into autostaging
Merge remote-tracking branch 'origin/109909-case-performance' into autostaging
Merge remote-tracking branch 'origin/switch_to_site_code' into autostaging
update submodule refs