Merge branch 'Issue-2373287' into 7.x-1.x
Issue #2373287 by eshta: Follow up fix to qunit test timing.
Merge branch 'Issue-2373287' into develop