Fixing failing tests due to incorrect merging.
Fixing failing tests due to incorrect merging.

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