Merge "Update Setting-Up ONAP"