The cherry picks of OCPBUGS-20194 to 4.13 and 4.12 have destroyed the etcd restore procedure by backporting some changes made as part of OCPBUGS-19403 which are only valid for 4.14.

So please:

• Revert all the commits on 4.13 and 4.12 before the ones I posted.
• Re-do then, but with very extra care that only the changes on the original bugs are backported and nothing else. Be careful checking the diff.
• I'll be pleased to help in reviewing this once done.

Thanks in advance.