Use ubuntu-contributed AMIs, not marketplace ones
Merge pull request #136 from Metaswitch/non-marketplace-amis

No Reviewer Required - Use ubuntu-contributed AMIs, not marketplace ones