Bug 1073003 - More Werror bustage fixes on a CLOSED TREE. r=bustage

--HG--
extra : rebase_source : 86466eea48ddfc7b5698d97ca574ed6cdf79326e
extra : amend_source : 9eb590b24276a068bbb078152509b3c743bb40f8