AA: base-files: merge r34974 and r34975

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