Merged refs/pull/4800/head from repository cms-sw
EventContent and FastSim fixes