Fix error when items had invariant language versions (versions compared could be incorrectly the default language instead of the invariant language)
Merge v6 and v7 slns; increment version to RC4