Merge pull request #338 from leleuj/CAS-1322

trying to fix the build by increasing some timeouts
CAS-1322: Improve Build System

First commit