Fix AddAddress cs_mapaddresses/db transaction deadlock

Backported from bitcoin commit 940669657837e4a247a4d0746c12f52e8662f325
Merge branch 'deadlock-fixes' into deadlock-fixes2