Forward port #5530 into CMSSW_7_3_X

Notice there was a conflict 

```
++<<<<<<< HEAD
 +steps['RECODreHLT']=merge([{'--hltProcess':'reHLT','--conditions':'auto:com10_%s'%menu},steps['RECOD']])
++=======
+ steps['RECODreHLT']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run1_data_%s'%menu},steps['RECOD']])
+ #wmsplit['RECODreHLT']=2
++>>>>>>> 700b6a2
```

where I picked up the version which was in CMSSW_7_2_X (I.e. the lower part) since that's the correct thing according to the thread below.