Node in multiple menus, wrong alias is used

We had a node in two menus, our primary links and footer menus. We want menu-path-raw token to use the menu path from the menu entry configured in the node edit form. But the node_token_value function uses the first menu entry it finds in the menu_links table. Attached patch uses the configured parent menu if available.