CORE-6098: fixed some compilation issues with job-preserver