Updating coopr-templates to latest master

Includes:
- caskdata/coopr-templates#19
- caskdata/coopr-templates#20
- caskdata/coopr-templates#21
- caskdata/coopr-templates#22