SWITCHYARD-2474
Temporary dependency management fix
Will move to parent in later commit