Merging master into ext42_upgrade; fixing conflicts in RoadmapPlanningBoardApp.css