XLCLOUD-1495 Fixes in java stack and xsa layer templates.