OO-1261: improved navbar collapse for sites/tabs/tools, tab text overflow handling in css, configurable icons for tabs
merge