Merge "Replace assertEqual(None, xx) with assertIsNone(xx)"