[JENKINS-18278] Merged
[fixed JENKINS-18281] Updated to newest cool