modify parser according to API changed derived by CLOUDIFY-2303