Merge "fix import and vRNC Ctrl_net definition error"
authorjulien zhang <zhang.jun3g@zte.com.cn>
Tue, 12 Jul 2016 00:49:16 +0000 (00:49 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 12 Jul 2016 00:49:16 +0000 (00:49 +0000)

Trivial merge