Merge "Fix NPE when submitting review with inline comments via REST" into stable-2.9