Fix Bug 1035336, fix jQueryUI spaghetti and upgrade to latest
Merge pull request #2306 from ossreleasefeed/bug1035336-cleanup-jquery-ui-spaghetti

Fix Bug 1035336, fix jQueryUI spaghetti and upgrade to latest