Use py27 version of assertRaisesRegexp

Now that we don't support py26 we can use the built in
assertRaisesRegexp (which takes slightly different parameters).

Change-Id: Icf30a75f353809984bafb202781120d16979f670
Merge "Use py27 version of assertRaisesRegexp"