Improve support for multiple regions - select correct image correctly, and handle deletion/cleanup
Merge pull request #52 from Metaswitch/multi_region

[Reviewer: Andy] Improve support for multiple regions