Updated to hopefully handle s3 bundle naming issue better with duplicate bundle name occuring in S3 assets.