Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Stripped out all additionalKeys dependencies
Replaced existing then() calls with calls to done() and fail()
Stripped out additionalKeys arg in unit tests
Restored brackets-concat.js
Update src/extensions/default/HTMLCodeHints/unittests.js

Removed Remaining additionalKeys
Update src/LiveDevelopment/Agents/RemoteAgent.js
Merge pull request #2685 from WebsiteDeveloper/issue#1997

Fixed: #1997 and #1397