Fix swapped bitcoin.conf finding code

The Mac OSX and Windows code to find bitcoin.conf was swapped.
Merge commit '25511576c20e9d11d134846f08561fda22b06240'