Modified fix for bug#9959 - & breaks ExpandCustomerName.
Modified fix for bug#9959 - & breaks ExpandCustomerName.

vlascoder/otrs,mbeijen/otrs-1,noritnk/otrs,vlascoder/otrs,noritnk/otrs,vlascoder/otrs,mbeijen/otrs-1,capeit-tto/otrs,capeit-tto/otrs,noritnk/otrs,capeit-tto/otrs,mbeijen/otrs-1