Fix ZEN-13037; disallow duplicate deployment ids
Sync with develop
Merge pull request #763 from control-center/feature/ZEN-13037

Feature/zen 13037