Merge "policy2tosca doc patch set-3"
authorZhipeng (Howard) Huang <huangzhipeng@huawei.com>
Wed, 7 Sep 2016 00:31:15 +0000 (00:31 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 7 Sep 2016 00:31:15 +0000 (00:31 +0000)

Trivial merge