Merge branch 'release/2.5.0'
Alter dependent version of CSF software utilities to v2.6.0
Resolve unreported issue - contained projects no longer use solution version

This only causes a problem when the projects are included in other solutions,
for example as submodules.  The contained projects were picking up version
numbers from the contained solution.  This is no longer the case.
Bump version numbers
Fix some references to now-obsolete functionality.

This is a trivial change, the non-obsolete versions are used instead.
Merge branch 'release/2.5.1' into production