Fixed bug#9959 - & breaks ExpandCustomerName.
Fixed bug#10035 - Adding a GenericAgent Job with an already existing name, will not be added, no error displayed.
Merge remote-tracking branch 'upstream/master'