Use addCleanup in test_rebuild_server

Use addCleanup in test_rebuild_server to restore the test server
to its original image.

Change-Id: I69d3e20be7fb6ef38fd89f0132aff720ef87253e
Closes-bug: #1449563
1 file changed