Updated the name of the trace log file to reflect the correct version of MAV
Fix for bug# 849. Fall back to using the users UPN if samAccountName cannot be found. This was seen in UPM mode only
Fixes for bugs 518, 845, 846, 847, 848