Fix config file based on trunk-tracking instead of master