Added additional test cases and correct one bad test case. Fixes #4364, !__mergeAssociation() in dbo_source fails to merge belongsTo properly" git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6606 3807eeeb-6ff5-0310-8944-8be069107fe0