Fixing failing tests from merge with 1.3
Fixing failing tests from merge with 1.3

nrother/cakephp,nrother/cakephp,CakeDC/cakephp,ndm2/cakephp,mvdriel/cakephp,garethellis36/cakephp,eryw/cakephp,pbaire/cakephp,et304383/passbolt_api,Balachan27/cakephp,dakota/cakephp,Phillaf/cakephp,burriko/cakephp,tisu2tisu/cakephp,CVO-Technologies/cakephp,eryw/cakephp,adopico/cakephp,tgr0ss/cakephp,jeffblack360/cakephp,davidyell/cakephp,garethellis36/cakephp,bravo-kernel/cakephp,thinkingmedia/cakephp,elboletaire/cakephp,mvdriel/cakephp,tgr0ss/cakephp,et304383/passbolt_api,ADmad/cakephp,dakota/cakephp,erikfig/cakephp,gmponos/cakephp,et304383/passbolt_api,Balachan27/cakephp,cakephp/cakephp,jjj117/cakephp,tisu2tisu/cakephp,cakephp/cakephp,thinkingmedia/cakephp,dkarvounaris/cakephp,yinhe007/cakephp,berrygoudswaard/cakephp,garethellis36/cakephp,timhoeppner/cakephp,cakephp/cakephp,petteyg/cakephp,eryw/cakephp,cakephp-fr/cakephp,berrygoudswaard/cakephp,tisu2tisu/cakephp,bravo-kernel/cakephp,burriko/cakephp,ADmad/cakephp,eboominathan/cakephp,akintoey/cakephp,bravo-kernel/cakephp,web-player/cakephp,michaelze/cakephp,jeffblack360/cakephp,CVO-Technologies/cakephp,justinyost/cakephp,akintoey/cakephp,pbaire/cakephp,tenkoma/cakephp,Balachan27/cakephp,elboletaire/cakephp,adopico/cakephp,cakephp/cakephp,pbaire/cakephp,akintoey/cakephp,jeffblack360/cakephp,petteyg/cakephp,timhoeppner/cakephp,CakeDC/cakephp,michaelze/cakephp,mvdriel/cakephp,nrother/cakephp,petteyg/cakephp,ADmad/cakephp,jjj117/cakephp,khoimt/cakephp-study,Phillaf/cakephp,garethellis36/cakephp,web-player/cakephp,gmponos/cakephp,elboletaire/cakephp,erikfig/cakephp,tenkoma/cakephp,ndm2/cakephp,et304383/passbolt_api,michaelze/cakephp,tenkoma/cakephp,dkarvounaris/cakephp,dakota/cakephp,jerems02/cakephp,ndm2/cakephp,Phillaf/cakephp,jerems02/cakephp,yinhe007/cakephp,jjj117/cakephp,berrygoudswaard/cakephp,ionas/cakephp,yinhe007/cakephp,eboominathan/cakephp,davidyell/cakephp,ndm2/cakephp,ADmad/cakephp,khoimt/cakephp-study,erikfig/cakephp,HavokInspiration/cakephp,justinyost/cakephp,kumamidori/cakephp,dkarvounaris/cakephp,tgr0ss/cakephp,ionas/cakephp,thinkingmedia/cakephp,eboominathan/cakephp,justinyost/cakephp,khoimt/cakephp-study,HavokInspiration/cakephp,kumamidori/cakephp,dakota/cakephp,cakephp-fr/cakephp,ionas/cakephp,petteyg/cakephp,CakeDC/cakephp,jerems02/cakephp,mvdriel/cakephp,gmponos/cakephp,CakeDC/cakephp,adopico/cakephp,burriko/cakephp,web-player/cakephp,CVO-Technologies/cakephp,timhoeppner/cakephp,HavokInspiration/cakephp,et304383/passbolt_api,kumamidori/cakephp,tenkoma/cakephp,davidyell/cakephp,cakephp-fr/cakephp