Remove duplicate appconfig.h file; merge differences in appconfig_common.h.