Decrease delays for travis. Not longer than 10 seconds
Merge branch 'fix-api-upload-tests-for-travis'