Need to be done to unblock
https://jira.onap.org/browse/CIMAN-234
See Jessica 's comment here
https://gerrit.onap.org/r/#/c/77828/