Fixes Deprecation warning for AssertEquals in tests

The CloudStack fixes are left to a patch I submitted on jira for libcloud-391

Note that the github trunk does not pass tox, but the apache trunk does...