For ENG-6244, port Stefano's fix for ENG-6438 to the DR branch, fix test cases, and exclude tests so I can start tracking down the failed testExportRollback