Merge "recovery: Reset optind to 1 after getopt"