luci-0.10: Merge r7907, r7927, r7966, r8222