Fixes up pre-value formatted data so it doesn't include ID in the value since this confuses things.
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0