70 x consumes migration i

Migration of CommonTools/TriggerUtils to 'consumes'/'getByToken'-API.