JBTM-1313 Merge in Gytis' changes to support Narayana with the jdk orb