Make edit block links compatible with Drupal core patched with block visibility fix

I'm mainly posting this so that I can include the patch in my Drush make file - thats why its against a really old version of zen (1.0)

But essentially, when your Drupal core is patched with #115596: Block custom title, visibility and pages settings get blanked out in block->configure (comment #35) the block edit links need to contain the theme name. Attached patch makes this happen.