Merge pull request #1 from dhellmann/v2flatten

a bunch of test updates
Merge branch 'v2flatten' of github.com:asalkeld/ceilometer into v2flatten