Fix to a comment line.
Removed confusing test I changed earlier. Added a new test.
Merge remote-tracking branch 'upstream/3.0' into router-prefix-to-route-key
Merge branch '3.0' into router-prefix-to-route-key
Merge pull request #2820 from sam-at-github/router-prefix-to-route-key

Router prefix to route key
Adding a __toString method to Entity for easier debugging
Merge pull request #2837 from cakephp/3.0-entity-pretty-print

3.0 entity pretty print
Fixed Query::set() to apply field types when an array is passed, closes #2836