luci-0.11: merge r9399-r9402 and r9412