U4-4928 - issue with missing media content properties
U4-4928 - issue with missing media content properties
U4-4956 UserService.SavePassword method always throws a not supported exception
Merge branch '6.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.4

Conflicts:
	src/Umbraco.Web/Models/PublishedContentBase.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs