luci-0.9: merge r5414, r5415, r5450 and 5494