Fix for context menu not appearing in the right position
a nicer fix for the issue
#1573 - Correction for the last fix
Fix for ColHeader not passing phantomjs tests
#1573 - Fix for tests failing
Merge branch 'feature/issue-1573' into develop