Merge pull request #8109 from vingtetun/defer

Bug 841353 - 'defer' more scripts. r=etienne(cherry picked from commit 88568d9f69edf0fcb7c59613f961b8804f1eaa88)

Merge pull request #8132 from vingtetun/841353-followup

Bug 841353 - 'defer' more scripts. followup. r=etienne(cherry picked from commit 83ea6d7a59071369376be9ef9b4b397a378dc18a)