Merge branch 'wip-u4-3951' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-3951

Conflicts:
	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
fixes some compatibility issues with PR for sortable pre-vals