Fix build:
    -fix migrations head (got branched)
    -fix a unit test

Reviewers: cramer

Reviewed By: cramer

Differential Revision: https://tails.corp.dropbox.com/D77541