Merge branch 'release-0.15 into develop

Merge branch release-0.15 into develop and resolve all conflicts.
Also, fix ordering of Pithos DB migrations and revert a commit
that breaks existing unittests.

@spapagian: Can you please take a look at updated Pithos DB migrations ?