Log merger and Configuration file migrator

Please merge.