olsrd 0.6.4

Closes #16896.
Closes #15838.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>