now preserving information about controlled inner edges when replacing traffic light programs with plain tll input

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@16236 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
leftover from [16236]

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@16238 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
Merge branch 'master' into planet