Merge "Respect restoreAnyVersion=true in full-data restore path" into nyc-mr1-dev