Merge "Define py27 assertFoo methods for py26"