Adding renamed file template.ebrd.com.yyyymmdd.cnf
Merge remote-tracking branch 'origin/master'