Merge upstream cetlib changes from a7c58c7d

No changes to build system, so this commit may break the build.
Trying to keep commits reasonably atomic/
Update build/test of cetlib for imported changes