Term path options are ignored

Problem/Motivation

Taxonomy term path options are ignored and not taken into account when constructing the redirection URL.
The issue can be reproduced if you try to override the uri callback using hook_entity_info_alter() and in the callback function pass any URL arguments, such as query string. Create a sample custom module with the following code:

function sample_menu() {
  $items['sample'] = array(
    'title' => 'Testing page',
    'page callback' => 'sample_sample_page',
    'page arguments' => array(),
    'access arguments' => array('access content'),
    'type' => MENU_CALLBACK,
  );

  return $items;
}

function sample_sample_page() {
  $tid = filter_input(INPUT_GET, 'tid', FILTER_SANITIZE_NUMBER_INT);
  $output = '<p>' . t('Sample page') . '</p>';
  if ($tid) {
    $output .= '<p>' . t('Viewing term ID: @tid', array('@tid' => $tid)) . '</p>';
  }
  else {
    $output .= '<p>' . t('The path did not work and term ID is not included in the query string. Try applying the patch.') . '</p>';
  }

  return $output;
}

function sample_entity_info_alter(&$entity_info) {
  $entity_info['taxonomy_term']['uri callback'] = '_sample_taxonomy_term_uri';
}
 
function _sample_taxonomy_term_uri($term) {
  return array(
    'path' => 'sample',
    'options' => array(
      'query' => array('tid' => $term->tid),
    ),
  );
}

Proposed resolution

Merge the $options array with term path options when constructing the redirect for taxonomy terms.
This way if the term path options array is empty, everything will work the same way as before.
Attached is the patch.

API changes

This should not have an impact to anything else.

Thanks!