Merge "Call parent::setUp() in DiffHistoryBlobTest before marking skipped tests"