Revert "TEIID-2958: adding the ability not require the ID fields in the merged documents, when needed they refer to the parent's ID as the FK or PK depending upon they are single or array type embedded document"

This reverts commit 399a7cc6ea2e5b3f62e27d123bd0354884a0a4f0.
Revert "Merge branch 'master' of git://github.com/teiid/teiid"

This reverts commit 872421ec164e1161ba095d588ce786ebc7817977, reversing
changes made to 399a7cc6ea2e5b3f62e27d123bd0354884a0a4f0.