Ensure that the s3 serviceId is added to the list of remote service if s3 upload
is enabled.
Merge branch 'mbst-7051-radioplayer-https-upload' into stage