branch now up-to-date with r31840
(obsolete modifications for lepton container beams not included)

svn diff -r30852:31048
svn diff -r31500:31531
svn diff -r31551:31671
svn diff -r31675:31693
svn diff -r31694:31704