Merge "Changes to CSIT so it executes in ONAP also"