Cleanup.py refactoring and change in .gitreview

Small cleanup.py refactoring, change fuel-ostf-tests to
fuel-ostf in .gitreview

Change-Id: I56bcfe2e3fdacd978ee6fad63cd29874e1b55281
Merge "Cleanup.py refactoring and change in .gitreview"