Update master and Travis build fix

Hi Sarah,

If you merge this pull-request your pull-request of: https://github.com/EUDAT-B2SHARE/b2share/pull/465 can be build with Travis-CI on B2SHARE. Moreover, there are some other upstream merges in it as well, since your branch is too far in the past.

Cheers!