luci-0.11: merge r9648, r9649 and r9654