Merge changes I4f924144,Ib40ec862
authorMichael Lando <ml636r@att.com>
Mon, 30 Oct 2017 12:27:50 +0000 (12:27 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 30 Oct 2017 12:27:50 +0000 (12:27 +0000)
commitff4b20bf1b5bec2a8b5d5e20ce3ff8a893edf9ff
tree2729f9b096d4d95d266dfa30a8e804940026776a
parent18eb9bba9880a36675bed5241c0ef66353f672a2
parent36f480d9b77815d7d7c8f12afc09ceb7e8228365
Merge changes I4f924144,Ib40ec862

* changes:
  Nodes in service template fix(Revert)
  Nodes in service template fix