Merge "Use unittest2.TestSuite with py26"