Merge "Update SettingUp ONAP"