Merge pull request #13301 from julienw/931767-fix-test-only a=tests

Bug 931767 - fix tests for the DST change only r=rwaldron(cherry picked from commit 19eeb4de77def88ea967d4b1d79bae4df05b523b)