Deal with case when deployinfo comes from the API
Merge remote-tracking branch 'origin/master' into kc-fastly

Conflicts:
	riff-raff/app/deployment/deployinfo.scala