Removing short circuiting support for v2 release. Renaming
asyncTestDelay to testTimeOutInterval.
Merge branch 'feature-remove-shortcircuit' into development