BS-11648 & BS-11651 :  change behaviour on columns header
fix protractor tests
Fix conflict