Backed out changeset 1d200bf40a51 (bug 855015) for mochitest-2 failures. a=backokut
Bug 861980 - Change sockopt length to be a socklen_t. r=echou, a=tef+
Bug 860849 - Fix 'Illegal Value' error in marionette. r=jgriffin, a=test-only