Enable "-count" option, use site objects from site generator

Since we have the site objects now, we use them directly without
re-creating them with it's language code. Also we sort the sites
by their dbnames.

Change-Id: If5b4f155a04665f2c32cf11931a13102d704d42a
Merge "Enable "-count" option, use site objects from site generator"