Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent
Macros - bugfix parameters
Core.Resolution - fix concurrency issues

Conflicts:
	src/Umbraco.Core/ObjectResolution/Resolution.cs
Core.Resolution - umbraco.cms.Action should NOT reset resolution
Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent
CoreXml - fix tests CRLF issues for build server
Core.EnumerableExtensions - refactor InGroupsOf to enumerate source only once
Core.StringExtensions - switch over to the new DefaultShortStringHelper
CoreXml - fix tests CRLF issues for build server, take 2
Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent
Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent

Conflicts:
	src/Umbraco.Core/ObjectResolution/Resolution.cs