fxa-content -> train-25, fxa-{auth,auth-db,customs} -> train-23

Lining this up with what is currently running in produciton at the moment.