Merge "(bug 36603) Make DumpFilter::$sink public again"