IDEA-106749 DevKit/ComponentNotRegisteredInspection inspection does not handle optional dependencies properly
IDEA-124876 ("Mismatched query and update of StringBuilder" false positive with lambda method reference.)
make test light
for CR-IC-5142
Fixed conversion.
Merge remote-tracking branch 'origin/master'
clearer test data file name
Ability to perform force update when there are uncommitted merge added

*hg update error pattern modified;
*comments added
Merge remote-tracking branch 'origin/master'
fix tests on linux (filename case)
Live templates: add diagnostic
Fix emmet preview in injected fragments

WEB-12079 Compass: allow choosing config.rb from additional content roots in config path chooser
Fix Emmet preview for big abbreviations
Allow emmet preview for xmlGenerator only
Commit document before creating callback