fixed a potential logout bug
Merge remote-tracking branch 'upstream/master' into bdtemp
Merge remote-tracking branch 'upstream/master' into bdtemp
merge issues with DataWalk
Merge pull request #1030 from bdonald25/bdtemp

fix merge conflics with datawalk