Merge pull request #2906 from castillofrancodamian/olsr-services