Merge pull request #92 from pulp/barnabycourt-1040958

1040958 - puppet uploader isn't returning a properly formatted upload report
Merge pulp-2.3 => master, pre-build