Atmire 1763 fix one waiver

Note this Pull request includes the changes from the following other pull requests.

https://github.com/datadryad/dryad-repo/pull/481

https://github.com/datadryad/dryad-repo/pull/480

The changes may be all tested via this pull request, or tested incrementally from the separately provided pull requests listed above.