Merge pull request #3457
d78f35a Explicitly ensure that wallet is unlocked in importprivkey (Wladimir J. van der Laan)