entry: switch AdditionalData to dict

Clients have been switched to use AddtionalData2, which is a
dictionary.  Move AdditionalData also to a dictionary so we
can stage a removal of AdditionalData2.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I7cc9591895f219471ac098387f72a35c18e6c750
diff --git a/elog_entry.hpp b/elog_entry.hpp
index ccb69a3..185c14e 100644
--- a/elog_entry.hpp
+++ b/elog_entry.hpp
@@ -76,8 +76,8 @@
         timestamp(timestampErr, true);
         updateTimestamp(timestampErr, true);
         message(std::move(msgErr), true);
-        additionalData2(std::move(additionalDataErr), true);
-        additionalData(util::additional_data::combine(additionalData2()), true);
+        additionalData(std::move(additionalDataErr), true);
+        additionalData2(additionalData(), true);
         associations(std::move(objects), true);
         // Store a copy of associations in case we need to recreate
         assocs = associations();