fix Assign id as name when all else fails
go fmt
Merge pull request #2591 from dotcloud/fix_Assign_id_as_name_when_all_else_fails

Fix Assign id as name when all else fails
Merge pull request #2589 from dotcloud/gofmt

Go fmt