L1t updates 7 2 x rebased

Rebase of PR #5201 
Updates for L1 Trigger Emulation for 2015 running.