luci-0.11: merge outstanding trunk changes