Refactor ohai-helper.
Part of #2071 (closed)
We no longer need to care about legacy uploads to AWS. I did a small refactor of the helper we use in our Makefile. As #2071 (closed) progresses, most of this will be removed or moved to a different location.