GUI-875
changed image cache key to use account instead of pid to make unique per user
tweak cache key so that amazon and aws-marketplace image sets are shared across accounts
Merge pull request #643 from eucalyptus/GUI-875

GUI-875