Make auto_capture? a per payment configuration

Fixes #4302