Fix bad merge: getaccountaddress was broken for new accounts
Fix bad merge: getaccountaddress was broken for new accounts

wastholm/bitcoin,wastholm/bitcoin,wastholm/bitcoin,wastholm/bitcoin,wastholm/bitcoin,wastholm/bitcoin