fixes #10495 by forcing .navbar-brand height to prevent it's inner content from increasing navbar height
Merge branch 'master' into pr/12388

Conflicts:
	dist/css/bootstrap.min.css