Fixed regression in refactoring

The refactoring in upstream caused the templates to become invalid: 

Affected machine config diff after changing:
```
@@ -11,7 +11,7 @@
   clear_node_high_bit:                 yes
   rrp_mode:                            none
   secauth:                             on
-  threads:                             4
+  threads:
   transport:                           udpu
   interface {
     member {
@@ -21,8 +21,8 @@
       memberaddr: db02.t5.mellon.tools.cgn.travian.info
     }
     ringnumber:  0
-    bindnetaddr: 10.64.16.168
-    mcastport:   5405
+    bindnetaddr:
+    mcastport:
     ttl:         1
   }
 }
```

This fix tries to fix the issues introduced by the regression, alrought certain changes are not 100% backward compatible (e.g. ::threadcount vs. ::processors). 

This fix is intested, but I think the whole refactoring process should be reviewed to verify correctness of the manifest.