Take 2: Bug 915672 - modify marionette test driver scripts to add suppor...

...t for gathering power draw data