changes for new dev and unix accounts
Merge remote-tracking branch 'upstream/master' into 19736