Change user attribute macros to $USER...$

but keep the $CONTACT...$ still supported for compatibility.

fixes #4792
Merge remote-tracking branch 'icinga2/master'