scram-project-build: sync with devel branch