Fixes for release 13.12

Synchronize these templates with what's provided by the RPMs.