Merge "Update ONAP Architecture diagram"