Merge "add retry parameters to allow SO to retry ConfigDeployVnfBB"