[FIXED JENKINS-12231] ensure right owner