Bug 1036928 - Allow to set longer time estimages as 60 minutes

Closed the previous pull- working only on this branch now.
You have added some trailing spaces here, which break `pep8` rules, so please remove them.