Merged refs/pull/4800/head from repository cms-sw
Migrate to 714patch1 template