JBIDE-15606 backport new builder from master to 4.1.x branch