[#1404] suppress error due to cppcheck not handling macros particularly well
[#1975] remove the repave of userName due to many assumptions made elsewhere in the code