waf: Readd -c switch for intltool_in, was not the source of prvious issues.
waf: Use waflib.Task for intltool related tasks.

Disable remerge of po files into tree 'updatepo' for now, does not work yet.