Merge "Fix jenkins-verify-images.sh crash on grep"