Update tests for instance pollster changes
Merge branch 'sio-wip' of github.com:anchor/ceilometer-publisher-vaultaire into sio-wip
Update tests for renamed counter -> metric