Bug 921130 - Fix --disable-ion build. r=luke
Bug 921293 - Don't print NS_WARNINGs if an environment variable is set (r=bsmedberg)