Converted all stx-openstack to use |prefix|
Fixed |vswitch-label|
Fixed comment lining
Replaced AVS by correct acronym
Solved conflict.
Minor fix.
Signed-off-by: egoncalv <elisamaraaoki.goncalves@windriver.com>
Change-Id: Ifd2b0b9ba9193ca3d02b7354679b933fc93d7eeb