luci-0.10: merge r7137, r7138, r7139, r7140, r7141 and r7142