Additional fix for CO-620
Additional fix for CO-620

irtnog/comanage-registry,mlaa/comanage-registry,irtnog/comanage-registry,ibrsp/comanage-registry,irtnog/comanage-registry,ibrsp/comanage-registry,mlaa/comanage-registry,ibrsp/comanage-registry,ibrsp/comanage-registry,mlaa/comanage-registry,mlaa/comanage-registry,irtnog/comanage-registry