- move some template keys to "full ones"
 - remove not provided key $INSTANCE
 - use 'old', less verbose key for http server


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32677 20353a03-c40f-0410-a6d1-a30d3c3de9de