Power mock changes
Merge branch 'master' of https://github.com/gauravarora/buildbot-tc