luci-0.8: merge r4476, r4477, r4585 and r4587