This patch fixes the bug in BZ 772352, where the lookup to find the provider account for
an image would only take into account the provider type and username credential, ignoring
the provider. Using the same EC2 account in multiple regions would trigger this bug.
The provider itself is now included in the query, so that we should always get the correct
account back.
-- Matt