Merge "Update the ONF's REMOTE cluster credential"