Revert "Revert "Assign template paths to their PD, and remove from GRUN,...

Reverts cms-sw/cmssw#5228