Fix AgaviTemplateLayer default parameters merging
add CHANGELOG entry
Merge 70666d7...bda5e47 (from pr-1490)

closes #1490

* pr-1490:
  bda5e47 add CHANGELOG entry
  70666d7 Fix AgaviTemplateLayer default parameters merging