Cherry-pick the assertContainsRow bugfix from master

Cherry Picking the fix on assertContainsRow from the master branch to 1.2.
The master branch requires PHPUnit 1.8, which is beta, and also requires php 5.4. I hope that it will be OK to backport this bugfix to 1.2 so that we can benefit from this bugfix immediately.