Merge pull request #3606

6943cb9 small changes to rpc command help message strings (Philip Kaufmann)
Merge pull request #3638

cdb6c16 remove setting methods in wallet/walletdb (Cozz Lovan)
44eb59e [Qt] remove broken OptionsModel::Upgrade() (Cozz Lovan)
Copyright header updates s/2013/2014 on files whose last git commit was done in 2014.
contrib/devtools/fix-copyright-headers.py script to be able to perform this maintenance task with ease during the rest of the year, every year. Modifications to contrib/devtools/README.md to document what fix-copyright-headers.py does.
gitian: Sort generated source distribution archive

Sort the filenames in the resulting tar, normalize the time/date
and user/group information.
linearize.py: Harmonize rpcpass to rpcpassword

linearize.py: harmonize rpcpass to rpcpassword according settings in
bitcoin.conf
gitian: add -D flag to ar for deterministic output for linux deps

ar -D: Operate in deterministic mode. When adding files and the archive
index use zero for UIDs, GIDs, timestamps, and use consistent file modes
for all files.  When this option is used, if ar is used with identical
options and identical input files, multiple runs will create identical
output files regardless of the input files' owners, groups, file modes,
or modification times.
gitian: Post-process .a libraries for win to be deterministic
gitian: sort generated source distribution archive for windows

Make the bitcoin-X.X.X.tar.gz deterministic.
Merge pull request #3625

4ce9106 gitian: sort generated source distribution archive for windows (Wladimir J. van der Laan)
6b55e6b gitian: Post-process .a libraries for win to be deterministic (Wladimir J. van der Laan)
c43d1e5 gitian: Make windows dependencies outputs fully deterministic (Wladimir J. van der Laan)
Merge pull request #3622

c13a13e gitian: add -D flag to ar for deterministic output for linux deps (Wladimir J. van der Laan)
1552145 gitian: Sort generated source distribution archive (Wladimir J. van der Laan)
aabcd11 gitian: Make linux boost dependency completely deterministic (Wladimir J. van der Laan)
aa93485 gitian: Make linux build of OpenSSL deterministic (Wladimir J. van der Laan)
Add option to avoid spending unconfirmed change
Move IsPushOnly() to script.cpp
Add HasCanonicalPushes(), and use it in IsStandardTx
Merge pull request #3025 from sipa/noncanpush

Make signatures with non-canonical data pushes non-standard.
Merge pull request #3651

1bbca24 Add option to avoid spending unconfirmed change (Wladimir J. van der Laan)
If requested, actually treat uncomfirmed change as being uncomfirmed

This commit strengthens 1bbca249b202c4802cc2c4d4de4a26e6392b4d92 by updating the CWalletTx::IsConfirmed() function.

If (bSpendZeroConfChange==false), then IsConfirmed() should actually treat unconfirmed change as being unconfirmed.
Rename IsConfirmed to IsTrusted to better match the intended behavior.

This doesn't change the functionality at all.
Merge pull request #3657

fdbc2b1 If requested, actually treat uncomfirmed change as being uncomfirmed (b6393ce9-d324-4fe1-996b-acf82dbc3d53)
fix non-standard reason string in main.cpp
Make qa/rpc-tests/ compatible with OSX

Reworked send.sh, so it works properly on my Mac (killall send.sh
doesn't work, because the process name is 'bash' not 'send.sh').
So now send.sh writes a .send.pid file, and invoking it as
send.sh -STOP (as the bitcoind -walletnotify) signals that PID.