Added automatic merge for 7_4_X in cmssw and cmsdist
Merge pull request #208 from nclopezo/update-auto-merge-branches

Added automatic merge for 7_4_X in cmssw and cmsdist