fxa-content -> train-25, fxa-{auth,auth-db,customs} -> train-23
Merge pull request #86 from jrgm/train-25-etc

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