Merge branch 'master-JBTM-1678' of git://github.com/Gytis/narayana into Gytis-master-JBTM-1678
JBTM-1877 - Remove expat and uses xerces for main config
JBTM-1718. Fixed race condition problem