Fixes to allow CDN to be used with static assets not served from BLC #1111