Merge "Add a missing test dependency for StagedRollbackTest"