JBTIS-370 - Updating 4.2.x branch to latest JBTIS TP and versions