Disable payment protocol pending further assessment and potential rework.
Replaced tabs with spaces.
Merge pull request #491 from rnicoll/1.7-dev-no-payment

Disable payment protocol pending further assessment and potential rework