Merge branch 'master' into moz_master
Use random test ID value to prevent potential mid-air collisions
Merge branch 'master' of github.com:mozilla-services/campaign_manager into moz_master
Merge pull request #9 from jrconlin/master

Use random test ID for self diag