[VOL-2875]v2 Fixes to formatting and multiversion build

Change-Id: I5fd56cbda10e8b019c796f40cb32905b78c700ec
2 files changed