Workaround the fact that select_for_update by default runs on the db_for_read rather than db_for_write
Merge remote-tracking branch 'pbs/support/2.3.x' into support/2.3.x