Merge "Fix OpendaylightApiNetwork key naming"