Fix bug in addto_srv_list()
Merge branch 'master' into unit_test