Merge "Added future compat expectException to PHPUnit4And6Compat trait"