sorry for this but it was easier for me to base this on first patch and do a reroll and removed the drupal_is_front_page in linkgeneratortest than trying to figure out what was wrong with later patches.