Updates sol006 branch with master

Change-Id: I0fc5d6f0dcf1b0827430602847f0f9e627a599e2
Signed-off-by: garciaale <agarcia@whitestack.com>