Alter crid generation to ensure nitro and bbc uris are changed to the same crid on output.
Merge branch 'mbst-7051-radioplayer-https-upload' into stage