CFY-1372 use new cloudify types