getting bug fixes from master

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