Reduce queries to count links

We used to store the redirect links and the direct links separately so we
had to count them separately.  We stopped that months ago and just added
the counts together.  This has us actually executing the counts together.
It should cut down on any query load from counting links.

Change-Id: I2bd1ccf9116d8702ec2c9978fbc9a4388522a7ee
Merge "Reduce queries to count links"