Bug 1083464 - Follow to fix build bustage caused by incorrect shell defaults; r=sfink a=bkerensa

--HG--
extra : rebase_source : 1d3f8adbf98d5c0beb73042be1603101f395a222