Merge pull request #3424
06eb2f2 Seperate out wallet options in help message (Wladimir J. van der Laan)