Fixing failing test caused by changes in Configure/App api's and merged code from 1.2
Fixing failing test caused by changes in Configure/App api's and merged code from 1.2

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