Merge "Re-enable test_merger_repack test" into feature/zuulv3