FIXED JENKINS-11260 and JENKINS-12256

Just copying result of MatrixRun-s that were not run to latest build.