Merge "Remove unused $fname in StubObject::_unstub"