3370: Change two more config options to AVM setting (refs #2052)

git-svn-id: file:///var/svn/freetz/trunk@10343 149334a1-2f27-0410-a3b9-fc62619ac1e6