Merge change 20419

* changes:
  new s2d ids table for rmq2; plus Gservices setting for using rmq2 protocol.