Merge remote-tracking branch 'upstream/propagate_metadata' into dryad-master
Correct problem with log4j configuration

Was preventing the paypal log messages from getting into the file
Merge pull request #590 from ryscher/finalize-button

Finalize button