* js2-mode: merge from upstream

Lots of small changes, too many to enumerate.
Re-apply the Toggles -> Toggle wording change
* js2-mode: same for Returns -> Return