Revert "Rebasing into 8.4.x the changes related to using new bom's"

This reverts commit deda04fad92b4d763dac00250fdde4aeaa909a92.
Rebasing several the commits related to using 2 bom's