Merge "Add the required call to the parent setUp to DiffHistoryBlobTest::setUp()"