am 12cfc600: Merge "Clean up after verifier changes wrt. conflict/undefined reg."

* commit '12cfc600d21ebf97373be59f1bd538b68687b5bf':
  Clean up after verifier changes wrt. conflict/undefined reg.