Merge "Correct SettingUp ONAP"