DBUA creates a listener for each SID upgraded - is there a way to change/force existing LSNR

If I use DBUA (Oracle recommended Upgrade path) - it adds LISTENER_SID to Init.ora parameters and the TNSNAMES.ORA.

Is this new to 11.2?  

Is there a way to start DBUA and not have it do this?  I don't mind it adding the init parameters, but would like to have it use the one I have setup LSNR2.

Is there a response file I can edit/use?

Or should I set the TNS_ADMIN environment variable before the upgrade (not set with existing environments).  

It's just extra cleanup after the Upgrade.  Trying to streamline processes before we get to larger DB's.