1040958 - puppet uploader isn't returning a properly formatted upload report
Fix copyright
Fix error on RHEL 6 & Fedora 18
Remove extra argument to method that was preventing it from running properly
Update for pep8 & signature change of method
Merge branch 'barnabycourt-1040958'