Merge "bugfix: workaround for opencontrail"
authorchenshuai@huawei.com <chenshuai@huawei.com>
Sat, 16 Jan 2016 05:14:13 +0000 (05:14 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Sat, 16 Jan 2016 05:14:13 +0000 (05:14 +0000)

Trivial merge