Bug 1031009 - Follow m-c baseconfig.mk changes, r=jcranmer.
Bug 1027241 - Import nsICMS* from Gecko to MailNews Core to fix bustage caused by their removal from Gecko, r=jcranmer, a=jcranmer to reopen CLOSED TREE

This patch also contains work by Hiroyuki Ikezoe, Brian Smith, and Joshua Cranmer.