Merge "Fix critical issues"
authorDan Timoney <dtimoney@att.com>
Thu, 14 Sep 2017 18:21:17 +0000 (18:21 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 14 Sep 2017 18:21:17 +0000 (18:21 +0000)

Trivial merge