Backport mac_user.py fixes to 2014.1

Refs #18281 and #19009