split fix virtual path into n2 and s3 to support cloudfront prefixes used in uploadFolders configuration (i.e. urlPrefix="static.mydomain.com").
update formatting
Merge branch 'chos-feature/add-support-for-cloudfront'