move a few config symbols to the 2.6.23 template