Additional commit for CO-1409
Additional commit for CO-1409

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