Merge change 2118 into donut

* changes:
  Add work-around for running DDMS on 64-bit Linux.