am 3c0081b0: Merge "Use exactly the same timings for the ElectronBeam as JB." into jb-mr1-dev

* commit '3c0081b069acf06912b2497cb93664efc43c52ed':
  Use exactly the same timings for the ElectronBeam as JB.