Small fixes to handlers, preparation mostly.
Also provide a handle that we need to pass to ACME.
Authored by: dannybackx 2020-02-02
Parent: [r290]
Child: [r292]
