Bug 978468 - Add some MOZ_FINAL to XBL. r=mrbkap
Bug 978486 - Remove nsErrorService::mErrorStringBundleKeyMap. r=froydnj
Automatic merge