Squash all 5_BRANCH commits into logical groups

Before we raise a pull request for our AS changes to M2, we need to reduce the number of commits. To do this we should squash them into logical groups. E.g. TXFramework, artefact name changes and version numbers.