(#1321) - Changed global timeout to 10s. Specific tests that exceed the 10s timeout have timeouts of 15s
Merge branch 'newtimeout' into 1321-issue-mocha-timeout