Merge "fix controller creation bug type field have the wrong id so caused json parse...
authorjin xin <j00101220@huawei.com>
Mon, 31 Oct 2016 02:18:23 +0000 (02:18 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Mon, 31 Oct 2016 02:18:23 +0000 (02:18 +0000)

Trivial merge