Fix broken build by adding olink.xml and removing misplaced keep-togethe...

...r