In sync with LCG_96b. Note that the build itself had to be updated a bit
to account for the peculiarities of the new software version.