Merge remote-tracking branch 'origin/CON-1707' into CON-1709

Conflicts:
	extensions/wikia/AssetsManager/configGroups/VenusConfig.php
	extensions/wikia/LocalNavigation/LocalNavigation.setup.php
	extensions/wikia/LocalNavigation/LocalNavigationContributeMenuController.class.php
	extensions/wikia/LocalNavigation/LocalNavigationController.class.php
	extensions/wikia/LocalNavigation/styles/LocalNavigation.scss
	extensions/wikia/LocalNavigation/templates/LocalNavigationContributeMenu_Index.php
	extensions/wikia/LocalNavigation/templates/LocalNavigation_Index.php
	extensions/wikia/LocalNavigation/templates/LocalNavigation_Wordmark.php