SWITCHYARD-1654 - Fix for classloader/validator issue