Bug 1097550 - "System dictionaries with underscore separator are ignored when trying to find dictionary". r=ehsan
Bug 1106547 - Return EOS after drain is complete, rather than before. r=cpearce