JBTIS-370 - Updating to latest JBTIS TP and updating versions
Merge branch 'bfitzpat-JBTIS-370b'