Fix one small user id / session issue, needs more fixes.
Getting ready to merge in latest workdev changes.
Merge branch 'workdev' into jeffdev
Merged in a couple workdev updates.