Merging with the correct branch (for Erik)

account number is null for AWS accounts. Also removes unnecessary second
describe image calls for AWS.