Fix for I-127741 (https://appirio.my.salesforce.com/a3v50000000CojA)
timeout: 10m -> 4m
Merge branch 'kohata-i-127741-api-timeout' into technology-2014-10-02