getting bug fixes from master

Change-Id: Ia9e104b3e3fe0323bf6e8efd047b9260aea8e66e
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
1 file changed