Refix Bug B65-ZK-2210: improve zk portlet 2 integration
http://tracker.zkoss.org/browse/ZK-2210
Merge remote-tracking branch 'upstream/6.5'