Making fastjet 3.1.0 more thread-safe, Take 2

Revisiting #6 . Here I started with the CMS patches to 3.0.3 and tried to follow Chris's example more closely.