3.0 hydration fixes

Fixes https://github.com/cakephp/cakephp/issues/3113