luci-0.10: olsr-services: Merge r7908 and r7926