Merging INI file changes is a giant pain. OsslEnable.ini is a giant mess. Really you must use Git, and use a file comparison/merge program like Beyond Compare with the original source. And then work out what code cored deleted that you need, like the XMLRPC console command. Also, you must delete dlls in opensim\bin that are old. Then fix all the third party modules.
Them wprk around the robust.dll issues with concurrent startups. 5 months now and still working on it.
like(1)