[Brightbox] Don't set generic names in tests

To see updates are happening, the tests originally reset the names to
values from fog. However this messes up the names for any other purposes
such as telling one fog test account apart from another.

This sets the values back to the original value.
[Brightbox] Fix SQL instance waiting in tests

API changed to prevent deleting an server whilst snapshots are occurring
but the test was waiting in the wrong place for the wrong thing.

Seems e78d096 did not correctly solve the problem when requests are
being tested.
Merge pull request #2741 from brightbox/brightbox_updates

Brightbox test updates