Since it will probably be SAP Fiori customers that run into this issue I want to point to the blog I wrote that describes how you can solve a problem with multi origin scenarios when you upgrade to SAP NetWeaver 740 SP13.
Problems with multi-origin in SAP NetWeaver 740 SP13 ... and how to solve them
Best Regards,
Andre