Added settings xml servers tags after feedback.
testMerge remote-tracking branch 'upstream/master'