DAR-731 missing wfProfileOut calls
DAR-731 better conflict handling
Merge branch 'css-chrome-sprint12' into DAR-730
fixed the bug found during functional tests phase