Merge "Update Master RN and Setting up ONAP"