Add server to clean up even in case of errors

In the case of instance build times out it would never been added to cleanup so
we put it on the list before wait for it get ready.

Fixes bug #1292641

Change-Id: Id030457cfe038849b81008de18b5f93fc024a47e
Merge "Add server to clean up even in case of errors"