Fix build failures.

The recent Query->join() changes contained an invalid column name, and
the changes to EntityContext necessitated changes in the tests to
reflect what should have always been reality.
Merge pull request #4029 from cakephp/build-fix

Fix build failures.