Merge pull request #14 from amdmdi/CAMEL-15379

CAMEL-15379: Fix failing cdi examples tests