Fix modules so the versions are substituted
Merge branch '8.7.x' of https://github.com/teiid/teiid into 8.7.x
TEIID-3092 correcting how parent is handled