Add test for #4309

The Router internals don't handle // which is good.
fix failing testLogError
Merge pull request #4373 from mstra001/master

fix failing testLogError
Fixes #2707

When the first variable argument = null, but there are more arguments given.
Added testcases to show the change (to fail before the fix)
Merge pull request #4366 from hmic/ticket#2707

Fixed i18n __*() bug
Fix CURRENT_TIMESTAMP being stored as a default value.

When reflecting timestamp columns in MySQL current_timestamp comes back
as the default value. This causes insertion errors later on as
'current_timestamp' is an invalid value for timestamp columns.

Refs #4184
Fix CS.
Merge pull request #4386 from cakephp/issue-4184

Fix CURRENT_TIMESTAMP being stored as a default value.
Update TagFixture.php

Updated the tag fixture so that it doesn't break `CakeSchema::_arrayDiffAssoc()`
Merge pull request #4403 from davidyell/patch-6

Update TagFixture.php
session bugfix
Merge pull request #4405 from php-engineer/master-session-bugfix

CakeSession::delete() bugfix
hasOne/belongsTo associations should contain associated records in afterFind

Before 1fe943d6f1814cd3756d71c035d2b69fc36ce066,
afterFind() is called twice with belongsTo/hasOne associations.
Although $results also doesn't contain associated records on first time,
it contains them on second time.

After 1fe943d6f1814cd3756d71c035d2b69fc36ce066,
it doesn't work if associated records are used in afterFind.
This commit fixes it.
Ensure that afterFind is called when using 'joins' with 'recursive' = -1
Resolve ambiguous column names
Resolve ambiguous column names for Sqlite
Merge pull request #4409 from chinpei215/master-issue2268-fix2

hasOne/belongsTo associations should contain associated records in afterFind
Clearing HABTM (unique) when HABTM array is empty, refs #2461
Merge pull request #4429 from jeremyharris/issue-2461

Clearing HABTM (unique) when HABTM array is empty. Fixes #2461
Make words ending in data uninflected.

Since both metadata and word ending in metadata have caused issues in
the past, uninflecting them seems like the best option. This will also
cover cases like ProfileData not being inflected to ProfileDatum which
seems like an improvement to me.

Fixes #4419