Change-Id: Ifb45b2cf72d71caa9c8a63f8e7684fd15b81e450 Implements: jira/CLOUDB-487 Signed-off-by: Gabor Orosz <gabor.orosz@ericsson.com>