AA: ubus: sync with latest trunk version (as of r37740)