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
Merge branch 'release/2.6.0'