refix ZK-1856 and fix zul
Merge branch 'F70-ZK-1856' of git://github.com/huangnoah/zk