Translating entity types in network topology

Change-Id: I8e52a15fe606562b7336fefd8c96a38a560a759a
Partial-bug: #1226159
Merge "Translating entity types in network topology"