testcase & fix
Merge commit 'zk-1603' into zkoss-master, this fix also fix 1595 and 1603