fix build war
Merge branch '7.0' of github.com:zkoss/zk into 7.0