Merge BTWF project revisions to production

Staging looks good: https://bugzilla.mozilla.org/show_bug.cgi?id=830434