update the ceilometer.conf.sample

- also update the extract_opts.py as it was not working

fixes bug #1173201

Change-Id: I348c9d37900deb520d04b3e3855012da2cdf8236
Enumerate the meter type in the API Meter class

This uses the counter definitions as this is how the db
is populated and thus will be consistent.

Change-Id: I145600822cb89e65dd515e5d2075f1c44cc0b087
Merge "update the ceilometer.conf.sample"
Merge "Enumerate the meter type in the API Meter class"