Merge "convertExtensionToRegistration: Put some keys (name, version, etc.) on top"