Merge branch 'update-paymentserver'

Update PaymentServer to a version with improvements to concurrency relating to
SQLite3 usage.

This seems to improve the situation though does not completely resolve it.