Fix concatenation in network tables

Remove concatenation and pluralization issues in network, subnet,
port, interface,wq and router tables.

Change-Id: I9ab759703505b188df0ec16b92f08d6f741ba944
partial-bug: 1307476
Merge "Fix concatenation in network tables"