luci-0.10: merge r6709-r6717