Merge "TOSCA-152 Fix issue" into sun
authorJian Huang <huang.jian12@zte.com.cn>
Fri, 28 Oct 2016 06:34:44 +0000 (06:34 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Fri, 28 Oct 2016 06:34:44 +0000 (06:34 +0000)

Trivial merge