Merge "Rename CDN config variables to be generic, deprecating the old names"