conflict resolution
no longer need v1 restriction on UglifyJS
Partial (manual) cherry-pick from 648ad03