SWITCHYARD-1424 Reduce warnings produced by deltaspike