SWITCHYARD-1647 - Fixes for Java warnings