VOL-2624 - fix SCA issues

Change-Id: I3a5e0aafc5b6bd6c6e865675a3481db289a7d772
15 files changed