Merge remote-tracking branch 'upstream/develop' into sam_20131001
Merge remote-tracking branch 'upstream/develop' into sam_20131001
Merge remote-tracking branch 'upstream/develop' into sam_20131001
Fixed tags for progress events in state runs
Added preload parm to fire_master so can preload event meta data
such as jid.
Merge remote-tracking branch 'upstream/develop' into sam_20131001
Merge pull request #7665 from SmithSamuelM/sam_20131001

Fixed tags for progress events and preload