Merge "Display 'Base' as location for inline comments on parent revision"