Merge branch 'alternative-sw-image-desc' into 'master'

Updated hackfest_basic_vnf for testing alternative-sw-image-desc

See merge request !119