Updated conf files. Merge from trunk.