Merged Tao-CSC-Trigger-Upgrade-ME21-SLHC10 from repository tahuang1991
Merge update from Sven