EUCA-8976: don't attempt to remove IP mapping more than once
Merge branch 'dev/spark/EUCA-8976' into testing