js2-mode: Merge from upstream
js2-mode: Merge from upstream (js2-multiline-decl-indentation)