Merged newest config files into smartos package configs.