Fix issue with on cleanup when no reservations were created.

Change-Id: I096c490f984f5583a94cb22014b5d7998de0439e
Wait 20 seconds for address to reset after release

Change-Id: I1975e022c812052609ffbba37a8b6417c201067a
Revert "Hack for EUCA-9726"

This reverts commit 9ba433a39126a60ec68791b52998251e7f239545.