New config for train-2013.05.22 https://bugzilla.mozilla.org/show_bug.cgi?id=876779
adding default metric server
Adding new forcible issuer for firefoxos
Merge branch 'origin/train-2013.05.22'

Conflicts:
	chef/cookbooks/persona-webhead/recipes/metrics.rb