Usage: Fixup entity exists exception#8726

weizhouapache merged 2 commits intoapache:4.18apache/cloudstack:4.18from

shapeblue:fixup-usage-entity-exists-exceptionshapeblue/cloudstack:fixup-usage-entity-exists-exceptionCopy head branch name to clipboard