Merge "use build-package instead of build-scvpp and build-plugins"