Align the xp2 branch with the same Galleon versions used in base EAP – see JBEAP-20142

Note this issue original covered a base Galleon upgrade as well but that was done separately for a different reason.