Fix rebase

Change-Id: If39b0bc3ee6384808d7417676f3a75f9849d0397
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>