CE backport of new-sidebar-boards

See merge request !14246
# Conflicts:
#	app/views/layouts/nav/sidebar/_project.html.haml