BUG-2082: to retrigger merge

Change-Id: I0b770aa95b438c9344ccb72cd568719dabdaf196
Signed-off-by: Robert Varga <rovarga@cisco.com>