Increased timeout to deal with VERY slow build agents.  Otherwise the
transaction will time out (as it should) and the tests will fail.
Merge branch 'master' of github.com:apigee/usergrid-stack