luci-0.10: merge r8096, r8097 and r8098