Merge "org.onap migration"