SWITCHYARD-2383 - Some JCA tweaks