Merge "fix build-nfvo-svnfm-driver-docker-image"