Merge change 1526 into donut

* changes:
  cdma getNeighboringCids to fail with an exception