Add ABAP support for retrieval of Fiori rt content
fix merge issues