CLOUDSTACK-5194: portable ip - Improving cleanup code to
 avoid cascading failures