luci-0.10: merge r7206 - r7227