7240 alien fixes for 7270 labor, by s.ude (refs #2260, #2252)

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