Merge pull request #52 from zenoss/feature/ZEN-14323

Fix missed rename
Add missed rename
Merge pull request #53 from zenoss/feature/ZEN-14318

Add missed rename
Handle tenant ids properly during incremental instance updates.
Merge pull request #55 from zenoss/feature/set_tenant_id

Handle tenant ids properly during incremental instance updates.
Remove incorrect impacts relationship.  I am not sure how this test was passing before.
Kludge the tenant ID tests into passing.  Really should fix my test data.
Update to 8ae3ad1f1a7e81b50028a9a1d12823c87bc2c15a
update calls to catalog_search- the expected arguments and return value have changed in more recent ZPL releases.