so there was weird whitespacing that got messed up the last time this was run, this fixes that and cleans up vendor helpers as well :)
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: a016ec6fd168016d94d6cfd1e2189f8c25f6de1f
Component: engine