Merge branch 'killbill:v3' into v3

Author: reshmabidikar

userguide/aviate/aviate-custom-invoice-sequencing.adoc

@@ -21,6 +21,8 @@ To use the custom invoice sequencing feature provided by the Aviate plugin, ensu
 com.killbill.billing.plugin.aviate.enableCustomInvoiceSequencing=true
 ----
 
+=== Tenant-level Configuration
+
 In addition, the Aviate Custom Invoicing feature requires some tenant-level configuration.  This can be done by executing the https://killbill.github.io/slate/tenant.html#add-a-per-tenant-configuration-for-a-plugin[per-tenant configuration] endpoint as follows:
 
 [source, bash]

userguide/platform/includes/killbill-configuration-properties-table.adoc

@@ -102,9 +102,6 @@ KB_org_killbill_invoice_inArrear_mode   |Determine how the system should behave
 |org.killbill.invoice.parkAccountsWithUnknownUsage/
 
 KB_org_killbill_invoice_parkAccountsWithUnknownUsage   |Whether to park accounts when usage data is recorded but not defined in the catalog   |false   |Per-Tenant/Config File/Environment Variable
-|org.killbill.invoice.rescheduleIntervalOnLock/
-
-KB_org_killbill_invoice_rescheduleIntervalOnLock   |Time delay to reschedule an invoice run when lock is held   |0s   |Per-Tenant/Config File/Environment Variable
 |org.killbill.invoice.maxInvoiceLimit/
 
 KB_org_killbill_invoice_maxInvoiceLimit   |How far back in time should invoice generation look at   |P200Y   |Per-Tenant/Config File/Environment Variable