updates to cakephp 2.6-RC