Better support for https asset conversion on checkout page
Minor cleanup
Merge pull request #2270 from ghost1227/issue/1836

Better support for https asset conversion on checkout page