Separate power and energy pollsters

blueprint one-meter-per-plugin

Change-Id: I30c9b49df6ed7bc5b3a55323624040b28c8ad929
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
Merge "Separate power and energy pollsters"