Prepare post 3.6.0-m1 builds

Change-Id: I99646ccf0b7c7a157150b3bb9bcaf14a8c3ce96d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>