Prepare post 3.6.0-m1 builds

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