luci-0.10: merge r7161, r7162, r7163, r7164, r7165 and r7166