Manual merge 7_3_X into 7_3_ROOT6_X

[nclopezo]

Last Friday, I noticed that around October 22nd, the automatic merges from from CMSSW_7_3_X to CMSSW_7_3_ROOT6_X had merge conflicts and were not working. As you can see here:

https://cmssdt.cern.ch/SDT/html/showIB.html#CMSSW_7_3_ROOT6_X_2014-10-22-0200

I started from the branch CMSSW_7_3_ROOT6_X. I did

 git merge CMSSW_7_3_X 

and then I manually solved the conflicts with the help of @davidlt.

I checked that #5975 does no affect the files CondFormats/PhysicsToolsObjects/interface/MVAComputer.h or
CondFormats/PhysicsToolsObjects/src/MVAComputer.cc

If this is ok I can merge it and activate again the automatic merges which should work again.

[cmsbuild]

A new Pull Request was created by @nclopezo (David Mendez) for CMSSW_7_3_ROOT6_X.

Manual merge 7_3_X into 7_3_ROOT6_X

It involves the following packages:

CondCore/Utilities
CondFormats/DataRecord
CondFormats/MFObjects
CondTools/Geometry
DQM/RPCMonitorClient
DataFormats/Candidate
DataFormats/SiStripCluster
DataFormats/TrajectoryState
FWCore/Catalog
FWCore/Services
GeometryReaders/XMLIdealGeometryESSource
HLTrigger/Configuration
IOPool/Output
IOPool/TFileAdaptor
MagneticField/Engine
MagneticField/GeomBuilder
MagneticField/Interpolation
MagneticField/ParametrizedEngine
MagneticField/Records
MagneticField/VolumeBasedEngine
RecoBTag/SecondaryVertex
RecoEcal/EgammaCoreTools
RecoHI/HiCentralityAlgos
RecoHI/HiTracking
RecoLocalTracker/SiStripClusterizer
RecoLocalTracker/SubCollectionProducers
RecoPixelVertexing/PixelLowPtUtilities
RecoTracker/ConversionSeedGenerators
RecoTracker/IterativeTracking
RecoTracker/MeasurementDet
RecoTracker/TkSeedingLayers
RecoVertex/AdaptiveVertexFinder
RecoVertex/VertexPrimitives
RecoVertex/VertexTools
SimCalorimetry/EcalZeroSuppressionProducers
SimCalorimetry/HcalZeroSuppressionProducers
SimGeneral/PileupInformation
TrackingTools/DetLayers
TrackingTools/KalmanUpdators
Utilities/ReleaseScripts
Utilities/StorageFactory

@diguida, @ianna, @cerminar, @Martin-Grunewald, @rcastello, @perrotta, @civanch, @cmsbuild, @fwyzard, @ktf, @Dr15Jones, @mdhildreth, @rovere, @deguio, @slava77, @ggovi, @vadler, @mmusich, @ojeda, @apfeiffer1, @nclopezo, @danduggan, @monttj, @StoyanStoynev can you please review it and eventually sign? Thanks.
@ghellwig, @forthommel, @abbiendi, @argiro, @nickmccoll, @jazzitup, @lgray, @threus, @venturia, @azsigmon, @battibass, @makortel, @acaudron, @dgulhan, @jlagram, @ferencek, @cerati, @trocino, @yetkinyilmaz, @yduhm, @wmtan, @GiacomoSguazzoni, @rovere, @VinInn, @bellan, @richard-cms, @namapane, @mandrenguyen, @imarches, @gbenelli, @wddgit, @appeltel, @yenjie, @kurtejung, @gpetruc, @pvmulder this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.

[wmtan]

I have no problem with this merge, if it builds

[cmsbuild]

-1
Tested at: 0217c5e
I found an error when building:

>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_7_3_ROOT6_X_2014-10-26-1400/src/DQM/RPCMonitorClient/src/RPCDBPopConAnalyzer.cc 
>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_7_3_ROOT6_X_2014-10-26-1400/src/DQM/RPCMonitorClient/src/RPCDCSSummary.cc 
>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_7_3_ROOT6_X_2014-10-26-1400/src/DQM/RPCMonitorClient/src/RPCDaqInfo.cc 
>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_7_3_ROOT6_X_2014-10-26-1400/src/DQM/RPCMonitorClient/src/RPCDataCertification.cc 
In file included from /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_7_3_ROOT6_X_2014-10-26-1400/src/DQM/RPCMonitorClient/src/RPCDCSSummary.cc:1:0:
/build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_7_3_ROOT6_X_2014-10-26-1400/src/DQM/RPCMonitorClient/interface/RPCDCSSummary.h:12:45: error: expected class-name before '{' token
 class RPCDCSSummary : public DQMEDHarvester {
                                             ^
>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_7_3_ROOT6_X_2014-10-26-1400/src/DQM/RPCMonitorClient/src/RPCDcsInfoClient.cc 
>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_7_3_ROOT6_X_2014-10-26-1400/src/DQM/RPCMonitorClient/src/RPCDeadChannelTest.cc 
gmake: **\* [tmp/slc6_amd64_gcc481/src/DQM/RPCMonitorClient/src/DQMRPCMonitorClient/RPCDCSSummary.o] Error 1


you can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-6017/393/summary.html