avoid concurrentmodificationexception

Reopening https://github.com/rackerlabs/blueflood/pull/269 due to https://travis-ci.org/rackerlabs/blueflood/jobs/20564026