Restoring primary key validation
Merge branch '3.0-validate-timestamps-fix' of github.com:cakephp/cakephp into 3.0-validate-timestamps-fix

Conflicts:
	tests/TestCase/Console/Command/Task/ModelTaskTest.php