Merge "Retry getImageVersion command on invalid output."