BZ-10553 fixed tooltips, z-index
Merge remote-tracking branch 'refs/remotes/origin/master'