luci-0.10: merge r7133, r7134 and r7135