luci-0.8: merge missing parts of r4293