Bug 979428: fix sense of test for git output
bug 1025335 - move to scl3; r=bhearsum
Merge from default

--HG--
branch : production