Merge "New helper ApiTestCase::setExpectedApiException()"