add even more cluster protections
Merged refs/pull/1177/head from repository cms-sw