Fix timeAgo Timezones problem
Added accessor method getView() to ViewVarsTrait.
Remove turning off auto rendering when action is called through requestAction().

You should return a response instance from the action to avoid auto rendering.
Refactor ViewVarsTrait::getView().
Add View::initialize().
Fix getMockForModel() using the incorrect datasource.

Because getMockForModel() does not go through the test datasource
injection in ClassRegistry::init() we need to duplicate the basics of
that logic here. Thankfully, we already have a mock so we can do that
datasource switching without reflection. Of course this means there will
be limitations to how/when this will work, but I feel those scenarios
can probably be solved by not using mocks, or by mocking out the
problematic methods. This set of changes makes getMockForModel() work
with secondary datasources, as one would expect it to do, but I'm not
sure it ever did.

Refs #4694
Add BC test for #4851
Possible fix for isUnique backward compatibility
Fix covers annotation value
Merge pull request #4874 from okonomi/patch-1

Fix covers annotation value
Fix API doc typos.
Merge pull request #4871 from rchavik/2.5-is-unique-test

2.5 Add isUnique test + possible fix
Make rule sniff less complicated and tidy up doc block.

Refs #4871
Clean up doc blocks.

Remove some words that I don't think need to be there.
Add assert to clarify what happened.

I was a tiny bit confused as to what the expected outcome was. This
additional assertion made it clearer to me.
Handle composite primary keys when merging many.

mergeMany() needs to be composite key aware as tables/associations can
easily have composite keys. I've used `;` as a separator as I've
not seen many composite keys with them, and even when they do an out of
place `;` will still enforce uniqueness.

Refs #4817
Fix PHPCS and PHP5.3 error.
Merge pull request #4742 from Laykou/patch-1

Fix timeAgo Timezones problem
Merge branch 'master' into 2.6

Conflicts:
	lib/Cake/VERSION.txt
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6