Merge pull request #679 from ccin2p3/f/cpu-percent-vs-ticks