Updates for amo staticfiles migration.

I will merge during push.

r? @oremj
accident?