Fix unitialised member variable
JBTM-1566 Fixes
Manual apply of JBTM-1697
Revert earlier change
ACE/TAO removal fixes to past all tests