Backport fixes for alphaS running#30

cmsbuild merged 3 commits intocms-externals:cms/240cms-externals/pythia8:cms/240from

mseidel42:cms/240mseidel42/pythia8:cms/240Copy head branch name to clipboard