Fix bug ZK-1602: Button with both autodisable and upload attributes set causes a javascript error
http://tracker.zkoss.org/browse/ZK-1602
fine tune ZK-1583
Merge branch '6.0' of github.com:zkoss/zk into 6.0
Merge branch '6.0'