PY-12981 django apps don't resolve when INSTALLED_APPS is set with '+='
Merge remote-tracking branch 'origin/master'
IDEA-81789 Expression Evaluation goes crazy when multiline expression is inserted
IDEA-119804 second click on item in watches panel should toggle edit mode
Maven: fix artifact layouts tests for added generated manifest.mf