Unify marshalling with saving.

Unify how nested associations are defined in marshalling and saving.
Having two different formats makes it harder to remember and document
the various features of the Table class.
Merge pull request #2522 from cakephp/3.0-marshall-unify

Unify marshalling with saving.