couple trivial fixes to quell clang complaints
the branchname says it, also the Uploader has been slightly adjusted
the branchname says it, also the Uploader has been slightly adjusted, 2 more
Merge pull request #3648 from igv4321/geners-clang-update

Clang -- couple trivial fixes to quell clang complaints
Merge pull request #3653 from hidaspal/SiPixelGenErrorDBObjectReader_small_changes_on_2014-05-02-0200

DB -- Si pixel gen error db object reader small changes on 2014 05 02 0200
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X