Patch for NEXUS-6185 Timestamped M2 Snapshots should be consumable over M1 shadow