rebasing changes

Change-Id: I19d804ed0d3ebadc098ae0a755a2b96ae8dd5915
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>