sync tags with onelab & switch to trunk for iptables and util-vserver