From: Michael Lando <ml636r@att.com>
Date: Mon, 30 Oct 2017 12:27:50 +0000 (+0000)
Subject: Merge changes I4f924144,Ib40ec862
X-Git-Tag: v1.2.0~775
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ff4b20bf1b5bec2a8b5d5e20ce3ff8a893edf9ff;p=sdc.git

Merge changes I4f924144,Ib40ec862

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

ff4b20bf1b5bec2a8b5d5e20ce3ff8a893edf9ff