added parameters for jet grooming
changed to read in value of grooming parameter
* check for stale lock file handle, detect long wait for file lock
* fixed filesize (for json file) update with new micro-merging code
*detection for hltOutput* module label in EvFOutputModule
fixing bug which causes filter to auto accept
Update the trigger selection
Update the trigger selection
removing a comment
Merge pull request #4774 from borrello/UpdateTriggerSelection

Update trigger selection
Merge pull request #4759 from Sam-Harper/EgammaPMBugFix71X

fixing bug which causes filter to auto accept
Merge pull request #4762 from smorovic/run-dir-check-71X

Run dir check fix for 71X
Merge pull request #4733 from clint-richardson/feature/addGroomingParametersForFastjet

Feature/add grooming parameters for fastjet
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X