Addressed data migration issues

@martynjames -- I've gone through the data migration scripts and addressed the issues with content key conversions -- take a look when you have a moment.