Fix jcloud library to work around CDI issue