CFY-1372 use new cloudify types
CFY-1327 updated neutron client to version 2.3.9
CFY-1230 merge commit