super quick performance win in the case where people don't pass in distinct values
Fixes: U4-5157 Membership.GetUser() causes 13 SQL queries, including duplicates
updates content xml bits so if it's called outside a web req it still executes.
updates content xml bits so if it's called outside a web req it still executes.

Conflicts:
	src/Umbraco.Web/umbraco.presentation/content.cs
Fixes: U4-5199 Appending certain query strings to URLs cause InvalidOperationException (The UmbracoContext.Current is null)
Merge remote-tracking branch 'origin/6.2.2' into 7.1.5

Conflicts:
	src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
	src/Umbraco.Web/Security/MembershipHelper.cs
	src/Umbraco.Web/umbraco.presentation/content.cs
Fixes: U4-5190 Overwrite Media File in 6.2.1 - process cannot access along with a bunch of other undisposed disposables :/
updates physical file system, now that files are being disposed of properly we don't need to delete first
Merge commit '874f464a2b51000920e2323f93bea116546e9b88' into 7.1.5

Conflicts:
	src/Umbraco.Core/IO/FileSystemExtensions.cs
	src/Umbraco.Core/IO/UmbracoMediaFile.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
Merge remote-tracking branch 'origin/6.2.2' into 7.1.5
Backports fix from 7 for GetDimensions call to ensure the file exists
fixes merge issue
replaces the tuple collection for bulk permission assignment to use a new model: EntityPermissionSet
Fixes: U4-4852 ContentService can add new permissions but not remove them
Fixes: U4-5198 Tags still appearing from items tagged in recycle bin
Adds another test
adds another test
Fixes: U4-5208 RenderActionInvoker needs to be able to run async so needs to inherit from AsyncControllerActionInvoker
Fixes: U4-5208 RenderActionInvoker needs to be able to run async so needs to inherit from AsyncControllerActionInvoker
Update fr.xml

Updated french umbraco translation from scratch, by translating en.xml. Tested and working.