Merge pull request #2238 from mmouselli/fixed_ui_olsr_service_menu