Merge "Increase timeout for testSetMaxFileSize test" into jb-mr1-dev