Merge "Fix expected stderr to refer to version 21." into lmp-dev