luci-0.10: merge r7188, r7189 and r7190