Merge "fix bug for failure in deleting subscriptions for vnfm"