Follow-up for Bug 1036825 fixing 2 issues. r=aeftimie, r=amatei, r=hskupin

--HG--
branch : mozilla-esr31
extra : transplant_source : z%E8%BC.%9B%A2-_4%FD%F5%CC%09%95%DF%CF%8Cp%D3%ED