Some fixes to make alerts work
Ec2 and RHOS catalog item
EC2 and RHOS catalog tests
updated tracer.py for cloud_catalog_item import
removed ec2 catalog item from tracer.py
wharf renewal support
Merge pull request #985 from seandst/wharf-renewals

wharf renewal support
Merge pull request #937 from mfalesni/alert_tests_fixes

Some fixes to make alerts work
Merge pull request #939 from sshveta/rhoscatalogtests

Ec2 and RHOS catalog item