CFY-606 restore agent/plugin installer mappings in types.yaml
Merge branch 'develop' into feature/CFY-859-existing-vm