luci-0.10: merge r7127, r7128, r7129, r7130 and r7131