Fixes legacy media business logic to return null when calling ToXml if the media item is trashed - this makes it consistent with how content works and also prevents being able to show the media on the front-end when it is trashed. Fixes up how the MediaService rebuilds the XML to make sure it's transactional based. Fixes: U4-3820 cached media xml is not cleared from the cmsContentXml table when recycled

Conflicts:
	src/Umbraco.Web/umbraco.presentation/library.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.0.1

Conflicts:
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Web/umbraco.presentation/library.cs
Fixes: U4-3826 It is possible in some cases to insert a macro inside a macro inside the rte