Use unmodified 'version' when not on a topic branch
Merge branch 'SPR-10124' into cleanup-3.2.x

* SPR-10124:
  Use unmodified 'version' when not on a topic branch
Merge branch 'cleanup-3.2.x' into 3.2.x

* cleanup-3.2.x:
  Use unmodified 'version' when not on a topic branch