Merge "rename nf-proxy to network-cm-proxy"