remove_avm_vpn-patch:
 * reimplement r10409 using function added in r10412 (i.e. eliminate code clone)
 * refs #2078


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