Merge pull request #39 from eucalyptus/r2.2

Merge fix for eustore resource
Added resource gathering for cloud eulb, euscale, and euwatch
Merge pull request #40 from hspencer77/euscale-eulb-euwatch-resources

Euscale eulb euwatch resources. Merging to test.