Rebasing master on top of the latest closure-compiler changes

Hello @nicks, 

The diff list is too long for this email

- [ ] The Server JS has been reviewed

R=@nicks