Updates branch sol006 with master

Change-Id: Ic562cbb8273139da0ff20389eec14bfca8c6f5ac
Signed-off-by: garciaale <agarcia@whitestack.com>
31 files changed