Issue #3396569: Remove active trail from bookmarks menu.
Fixes regression that was creating menu classes with the pattern menu--menu--'menu-name' instead of menu--'menu-name'.
Fixes regression that was creating menu classes with the pattern menu--menu--'menu-name' instead of menu--'menu-name'.