Merge branch 'release/1.1.1' into develop
Post Release: Version 1.1.1 -> 1.1.2dev.
Guard against conflicting relationship names.

Fixes ZEN-12873.
Merge pull request #23 from zenoss/feature/ZEN-12873

Please review branch feature/ZEN-12873
Release: Version 1.1.2dev -> 1.1.2.
Finished release 1.1.2.