Merge "Update setting up ONAP" into beijing