uci: sync with trunk

backport of r35013, r33861, r33660

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@35195 3c298f89-4303-0410-b956-a3cf2f4a3e73