Merge "TOSCA-152 Add metadata and service Template original Id property for service...
authorsun qi <sun.qi310@zte.com.cn>
Thu, 27 Oct 2016 09:28:49 +0000 (09:28 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Thu, 27 Oct 2016 09:28:49 +0000 (09:28 +0000)

Trivial merge