luci-0.10: merge r7148, r7149, r7150, r7151, r7152 and r7153