Updating tests related to #U4-5986
Updating the name of PropertyGroups in DB to ensure renaming is done properly
Merge branch '7.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.2.1

Conflicts:
	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs