Merge branch 'master' into nj/css-utils-ut
Remove unnecessary global from jslint header
Clarified titles for a couple of tests
Merge pull request #2365 from adobe/glenn/jslint-prefs

Use config setting for default JSLint enabling
Merge pull request #2357 from adobe/randy/emmet-enter-key

Be smarter about key event propagation and canceling, allowing key-handling commands to opt out of eating a key sometimes.
Override .no-focus for children that are actually text input fields
code review comments
Merge pull request #2378 from adobe/nj/issue-2377

Override .no-focus for children that are actually text input fields
Update to latest CodeMirror upstream master
Merge remote-tracking branch 'origin/master' into cmv3
codemirror breaks tokens on parens
[cmv3] Inline editor bugfixes:
* Don't try to hide any lines if the range to hide is empty.
* Set inclusiveLeft/inclusiveRight when marking text to be hidden so the first/last lines
  are included.
* If focus is in an inline widget before a refresh, restore focus afterward.
* Call _removeInlineWidgetInternal() when we remove a widget since we no longer get called
  back in this case.
* Fix up unit test hidden line verification to work with new v3 API.

Note that there are still three failing unit tests in InlineEditorProviders-test. Two of
them are related to inline widget sizing, which will be addressed in a future user story.
The third will be fixed by a bugfix that we're submitting upstream:
https://github.com/njx/CodeMirror/compare/widget-focus
Merge pull request #2382 from adobe/nj/cmv3-inline-fixes

[cmv3] Inline editor bugfixes
Some code review fixes. Added test for comment inside declaration.
Added multi-line cases for getInfoAtPos() (currently failing)
Disable failing getInfoAtPos() tests
Added one more multi-line case
Implement registerHintProvider api with extra parameters suggested by Glenn. This change also makes the problematic shouldShowHintsOnKey api no longer needed. It also resolves the conflicts between two or more providers by allowing each provider to register its specificity.
Putting back shouldShowHintsOnKey api since JS code hinting Ian is working on requires to be called for every keystokes.
Correct some mistakes in jsDoc.