Moved JENKINS-21457 from 1.549 to 1.550