add some improvements to PowerAPI tool and Gnuplot Reporter
resolve merge conflict