Update grml-etc conflict due to configfile move