BVAL-343 Fix for provider discovery via ServiceLoader