Bug ZK-1870: ZK Does not set session in SessionCtrl when handling a Portlet Ajax request
Bug ZK-1854: Issue with toolbar and hflex= 1
Merge remote-tracking branch 'upstream/master' into 7.0