Merge "Add 'id' property to service template." into sun
authorJian Huang <huang.jian12@zte.com.cn>
Thu, 27 Oct 2016 02:10:49 +0000 (02:10 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Thu, 27 Oct 2016 02:10:49 +0000 (02:10 +0000)

Trivial merge