Make instance DISPLAY_CHOICES translatable

Also fix a typo.

Change-Id: Ic69e19daba1cca31637b02799e51a023300062f4
Closes-bug: #1242541
Broken charting for non compute resources

- Code for resource charts contained query that
  filtered only nova instances. That condition
  is removed. Now it filters resources by the
  meter name.

Fixes bug 1243796

Change-Id: I7debb2b457ede83b726934c082f22307ddc0c630
Merge "Make instance DISPLAY_CHOICES translatable"
Merge "Broken charting for non compute resources"