Development branch: weekly merge 

No regressions found by QA with the current branch.
A few regressions on units/functional tests due to moving the olsr initialization have been fixed.