backport from trunk (rev #9912)
- fixed parsing the name of gateways in carrier definition (Gateways with minus char allowed in gateways, but carriers are not loading with such gateways)
  Credits go to Nick Altmann
  Closes patch #3607865