3.0 joins fixes

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