From: James Forsyth <jf2512@att.com>
Date: Thu, 6 Sep 2018 14:52:47 +0000 (+0000)
Subject: Merge "Sync up the changes between ecomp and onap"
X-Git-Tag: 1.3.0~40
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2a65f882a7f5ca191e59d6a043e97be129f06538;p=aai%2Faai-common.git

Merge "Sync up the changes between ecomp and onap"
---

2a65f882a7f5ca191e59d6a043e97be129f06538