Adjustments for SAP HCP

Change-Id: I243ad9ab5b86f5e4331a55463b22dbea136960db
Signed-off-by: Matthias Steiner <matthias.steiner@inscope.net>