AUI-925 Update to new YUI API
Merge branch '2.0.x' into 2.0.x-deprecated