CLOUDSTACK-6655: Fixing cleanup issues with portable IP test cases