Merged CSC-Trigger-Upgrade-GEM-RPC from repository gem-sw
bugfix