Merge "bug fix: aline with odl service script and karaf"
authorchenshuai@huawei.com <chenshuai@huawei.com>
Sat, 5 Dec 2015 12:22:48 +0000 (12:22 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Sat, 5 Dec 2015 12:22:48 +0000 (12:22 +0000)

Trivial merge