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

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

@@ -437,7 +437,7 @@ class ModelTaskTest extends TestCase {
 			'bake_article_id' => ['rule' => 'numeric', 'allowEmpty' => false],
 			'bake_user_id' => ['rule' => 'numeric', 'allowEmpty' => false],
 			'comment' => ['rule' => false, 'allowEmpty' => true],
-			'published' => ['rule' => false,'allowEmpty' => true],
+			'published' => ['rule' => false, 'allowEmpty' => true],
 			'otherid' => ['rule' => 'numeric', 'allowEmpty' => 'create']
 		];
 		$this->assertEquals($expected, $result);