Bug 841353 - 'defer' more scripts. followup. r=etienne

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 5156a494183513948892535626ffc768d3d271c1)