After leaks to the news media, awkward correspondence and a parliamentary investigation, Berlin and Washington are again at loggerheads over secret service activities.