Added check for local name and uid when adding
Merge remote-tracking branch 'salt/master'