update code to latest - ammend previous commit

update code to latest - ammend previous commit

Change-Id: Ia4f55789689b5f2ddd004a4fe89a63f72cecc27f
Issue-ID: DCAEGEN2-819
Signed-off-by: Betzer, Rony (rb844h) <rb844h@intl.att.com>
16 files changed