Provision for new shower library
Merged refs/pull/3858/head from repository cms-sw