Ensure the Caching File upload store knows about both https and ftp services when created.
Merge branch 'mbst-7051-radioplayer-https-upload' into stage